Unverified Commit 5fa5654f authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #1431 from nospam3089/fix/modern_generate_parameters 

Use DH_generate_parameters_ex()
parents 6a32dc99 c7f6f24e

openssl-sys/src/dh.rs

+7 −0
Original line number Diff line number Diff line
@@ -11,6 +11,13 @@ extern "C" { 
        cb_arg: *mut c_void,

    ) -> *mut DH;



    pub fn DH_generate_parameters_ex(

        dh: *mut DH,

        prime_len: c_int,

        generator: c_int,

        cb: *mut BN_GENCB,

    ) -> c_int;



    pub fn DH_generate_key(dh: *mut DH) -> c_int;

    pub fn DH_compute_key(key: *mut c_uchar, pub_key: *const BIGNUM, dh: *mut DH) -> c_int;

    pub fn DH_size(dh: *const DH) -> c_int;

openssl/src/dh.rs

+7 −5
Original line number Diff line number Diff line
@@ -75,17 +75,19 @@ impl Dh<Params> { 


    /// Generates DH params based on the given `prime_len` and a fixed `generator` value.

    ///

    /// This corresponds to [`DH_generate_parameters`].

    /// This corresponds to [`DH_generate_parameters_ex`].

    ///

    /// [`DH_generate_parameters`]: https://www.openssl.org/docs/man1.1.0/crypto/DH_generate_parameters.html

    /// [`DH_generate_parameters_ex`]: https://www.openssl.org/docs/man1.1.0/crypto/DH_generate_parameters.html

    pub fn generate_params(prime_len: u32, generator: u32) -> Result<Dh<Params>, ErrorStack> {

        unsafe {

            Ok(Dh::from_ptr(cvt_p(ffi::DH_generate_parameters(

            let dh = Dh::from_ptr(cvt_p(ffi::DH_new())?);

            cvt(ffi::DH_generate_parameters_ex(

                dh.0,

                prime_len as i32,

                generator as i32,

                None,

                ptr::null_mut(),

            ))?))

            ))?;

            Ok(dh)

        }

    }