Commit 35c79d17 authored by Steven Fackler's avatar Steven Fackler
Browse files

Fix build

parent 00db0bc4

openssl-sys/src/lib.rs

+0 −2
Original line number Diff line number Diff line
@@ -717,8 +717,6 @@ extern "C" { 
    #[cfg(feature = "rfc5114")]

    pub fn DH_get_2048_256() -> *mut DH;



    pub fn DH_new_from_params(p: *mut BIGNUM, g: *mut BIGNUM, q: *mut BIGNUM) -> *mut DH;



    pub fn ERR_get_error() -> c_ulong;



    pub fn ERR_lib_error_string(err: c_ulong) -> *const c_char;

openssl/Cargo.toml

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ x509_clone = ["c_helpers"] 
x509_generator_request = ["c_helpers"]

ssl_context_clone = ["c_helpers"]

hmac = ["c_helpers"]

dh_from_params = ["c_helpers"]



[dependencies]

bitflags = ">= 0.5.0, < 0.8.0"

openssl/src/c_helpers.c

+12 −0
Original line number Diff line number Diff line
@@ -15,6 +15,18 @@ STACK_OF(X509_EXTENSION) *rust_X509_get_extensions(X509 *x) { 
    return x->cert_info ? x->cert_info->extensions : NULL;

}



DH *rust_DH_new_from_params(BIGNUM *p, BIGNUM *g, BIGNUM *q) {

    DH *dh;



    if ((dh = DH_new()) == NULL) {

        return NULL;

    }

    dh->p = p;

    dh->g = g;

    dh->q = q;

    return dh;

}



#if OPENSSL_VERSION_NUMBER < 0x10000000L

int rust_HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int key_len, const EVP_MD *md, ENGINE *impl) {

    HMAC_Init_ex(ctx, key, key_len, md, impl);

openssl/src/c_helpers.rs

+1 −0
Original line number Diff line number Diff line
@@ -10,4 +10,5 @@ extern "C" { 
    pub fn rust_HMAC_Init_ex(ctx: *mut ffi::HMAC_CTX, key: *const c_void, keylen: c_int, md: *const ffi::EVP_MD, impl_: *mut ffi::ENGINE) -> c_int;

    pub fn rust_HMAC_Final(ctx: *mut ffi::HMAC_CTX, output: *mut c_uchar, len: *mut c_uint) -> c_int;

    pub fn rust_HMAC_Update(ctx: *mut ffi::HMAC_CTX, input: *const c_uchar, len: c_uint) -> c_int;

    pub fn rust_DH_new_from_params(p: *mut ffi::BIGNUM, g: *mut ffi::BIGNUM, q: *mut ffi::BIGNUM) -> *mut ffi::DH;

}

openssl/src/dh/mod.rs

+4 −1
Original line number Diff line number Diff line
@@ -7,9 +7,11 @@ use std::ptr; 
pub struct DH(*mut ffi::DH);



impl DH {

    /// Requires the `dh_from_params` feature.

    #[cfg(feature = "dh_from_params")]

    pub fn from_params(p: BigNum, g: BigNum, q: BigNum) -> Result<DH, ErrorStack> {

        let dh = unsafe {

            try_ssl_null!(ffi::DH_new_from_params(p.into_raw(), g.into_raw(), q.into_raw()))

            try_ssl_null!(::c_helpers::rust_DH_new_from_params(p.into_raw(), g.into_raw(), q.into_raw()))

        };

        Ok(DH(dh))

    }
@@ -75,6 +77,7 @@ mod tests { 
    }



    #[test]

    #[cfg(feature = "dh_from_params")]

    fn test_dh() {

        let mut ctx = SslContext::new(Sslv23).unwrap();

        let p = BigNum::from_hex_str("87A8E61DB4B6663CFFBBD19C651959998CEEF608660DD0F25D2CEED4435\