min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename new_by_curve_name to from_curve_name

This commit is contained in:
Steven Fackler 2016-11-13 20:21:44 +00:00
parent b2de36049a
commit 0d0b5080e2
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openssl/src/ec_key.rs
View File

@ -114,13 +114,18 @@ impl EcKeyRef {
} }
impl EcKey { impl EcKey {
pub fn new_by_curve_name(nid: Nid) -> Result<EcKey, ErrorStack> { pub fn from_curve_name(nid: Nid) -> Result<EcKey, ErrorStack> {
unsafe { unsafe {
init(); init();
cvt_p(ffi::EC_KEY_new_by_curve_name(nid.as_raw())).map(EcKey) cvt_p(ffi::EC_KEY_new_by_curve_name(nid.as_raw())).map(EcKey)
} }
} }
#[deprecated(since = "0.9.2", note = "use from_curve_name")]
pub fn new_by_curve_name(nid: Nid) -> Result<EcKey, ErrorStack> {
EcKey::from_curve_name(nid)
}
private_key_from_pem!(EcKey, ffi::PEM_read_bio_ECPrivateKey); private_key_from_pem!(EcKey, ffi::PEM_read_bio_ECPrivateKey);
private_key_from_der!(EcKey, ffi::d2i_ECPrivateKey); private_key_from_der!(EcKey, ffi::d2i_ECPrivateKey);
} }
@ -133,7 +138,7 @@ mod test {
#[test] #[test]
fn key_new_by_curve_name() { fn key_new_by_curve_name() {
EcKey::new_by_curve_name(nid::X9_62_PRIME256V1).unwrap(); EcKey::from_curve_name(nid::X9_62_PRIME256V1).unwrap();
} }
#[test] #[test]

2
openssl/src/pkey.rs
View File

@ -221,7 +221,7 @@ mod tests {
#[test] #[test]
fn test_ec_key_accessor() { fn test_ec_key_accessor() {
let ec_key = EcKey::new_by_curve_name(nid::X9_62_PRIME256V1).unwrap(); let ec_key = EcKey::from_curve_name(nid::X9_62_PRIME256V1).unwrap();
let pkey = PKey::from_ec_key(ec_key).unwrap(); let pkey = PKey::from_ec_key(ec_key).unwrap();
pkey.ec_key().unwrap(); pkey.ec_key().unwrap();
assert!(pkey.rsa().is_err()); assert!(pkey.rsa().is_err());

2
openssl/src/ssl/connector.rs
View File

@ -218,7 +218,7 @@ fn setup_curves(ctx: &mut SslContextBuilder) -> Result<(), ErrorStack> {
use ec_key::EcKey; use ec_key::EcKey;
use nid; use nid;
let curve = try!(EcKey::new_by_curve_name(nid::X9_62_PRIME256V1)); let curve = try!(EcKey::from_curve_name(nid::X9_62_PRIME256V1));
ctx.set_tmp_ecdh(&curve) ctx.set_tmp_ecdh(&curve)
} }