Commit 0d0b5080 authored by Steven Fackler's avatar Steven Fackler
Browse files

Rename new_by_curve_name to from_curve_name

parent b2de3604

openssl/src/ec_key.rs

+7 −2
Original line number Diff line number Diff line
@@ -114,13 +114,18 @@ impl EcKeyRef { 
}



impl EcKey {

    pub fn new_by_curve_name(nid: Nid) -> Result<EcKey, ErrorStack> {

    pub fn from_curve_name(nid: Nid) -> Result<EcKey, ErrorStack> {

        unsafe {

            init();

            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_der!(EcKey, ffi::d2i_ECPrivateKey);

}
@@ -133,7 +138,7 @@ mod test { 


    #[test]

    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]

openssl/src/pkey.rs

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ mod tests { 


    #[test]

    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();

        pkey.ec_key().unwrap();

        assert!(pkey.rsa().is_err());

openssl/src/ssl/connector.rs

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ fn setup_curves(ctx: &mut SslContextBuilder) -> Result<(), ErrorStack> { 
    use ec_key::EcKey;

    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)

}