Commit 16e8fbc3 authored by Bradley Beddoes's avatar Bradley Beddoes
Browse files

Fix EC_KEY_set_public_key_affine_coordinates 

Previous definition incorrectly used `const` pointers but the
underpinning library definition (unfortunately) does not.
parent d9e03218

openssl-sys/src/lib.rs

+1 −1
Original line number Diff line number Diff line
@@ -1674,7 +1674,7 @@ extern "C" { 
    pub fn EC_KEY_generate_key(key: *mut EC_KEY) -> c_int;

    pub fn EC_KEY_check_key(key: *const EC_KEY) -> c_int;

    pub fn EC_KEY_free(key: *mut EC_KEY);

    pub fn EC_KEY_set_public_key_affine_coordinates(key: *mut EC_KEY, x: *const BIGNUM, y: *const BIGNUM) -> c_int;

    pub fn EC_KEY_set_public_key_affine_coordinates(key: *mut EC_KEY, x: *mut BIGNUM, y: *mut BIGNUM) -> c_int;



    #[cfg(not(osslconf = "OPENSSL_NO_EC2M"))]

    pub fn EC_GF2m_simple_method() -> *const EC_METHOD;

openssl/src/ec.rs

+5 −5
Original line number Diff line number Diff line
@@ -462,8 +462,8 @@ impl EcKeyBuilderRef { 


    /// Sets the public key based on affine coordinates.

    pub fn set_public_key_affine_coordinates(&mut self,

                                             x: &BigNumRef,

                                             y: &BigNumRef)

                                             x: &mut BigNumRef,

                                             y: &mut BigNumRef)

                                             -> Result<&mut EcKeyBuilderRef, ErrorStack> {

        unsafe {

            cvt(ffi::EC_KEY_set_public_key_affine_coordinates(self.as_ptr(),
@@ -571,12 +571,12 @@ mod test { 
        let y = data_encoding::base64url::decode_nopad("4Etl6SRW2YiLUrN5vfvVHuhp7x8PxltmWWlbbM4IFyM".as_bytes())

            .unwrap();



        let xbn = BigNum::from_slice(&x).unwrap();

        let ybn = BigNum::from_slice(&y).unwrap();

        let mut xbn = BigNum::from_slice(&x).unwrap();

        let mut ybn = BigNum::from_slice(&y).unwrap();



        let mut builder = EcKeyBuilder::new().unwrap();

        builder.set_group(&group).unwrap();

        builder.set_public_key_affine_coordinates(&xbn, &ybn).unwrap();

        builder.set_public_key_affine_coordinates(&mut xbn, &mut ybn).unwrap();



        let ec_key = builder.build();

        assert!(ec_key.check_key().is_ok());