Commit 8ac66e7b authored by Steven Fackler's avatar Steven Fackler
Browse files

more fixes

parent 40423e9f

openssl/src/pkey.rs

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ impl PKey<Private> { 
        }

    }



    #[cfg(ossl110)]

    #[cfg(ossl111)]

    fn generate_eddsa(nid: c_int) -> Result<PKey<Private>, ErrorStack> {

        unsafe {

            let kctx = cvt_p(ffi::EVP_PKEY_CTX_new_id(nid, ptr::null_mut()))?;

openssl/src/x509/store.rs

+10 −4
Original line number Diff line number Diff line
@@ -159,10 +159,7 @@ impl X509LookupRef<HashDir> { 


generic_foreign_type_and_impl_send_sync! {

    type CType = ffi::X509_LOOKUP_METHOD;

    fn drop = |_method| {

        #[cfg(ossl110)]

        ffi::X509_LOOKUP_meth_free(_method);

    };

    fn drop = X509_LOOKUP_meth_free;



    /// Method used to look up certificates and CRLs.

    pub struct X509LookupMethod<T>;
@@ -197,3 +194,12 @@ cfg_if! { 
        }

    }

}



cfg_if! {

    if #[cfg(ossl110)] {

        use ffi::X509_LOOKUP_meth_free;

    } else {

        #[allow(bad_style)]

        unsafe fn X509_LOOKUP_meth_free(_x: *mut ffi::X509_LOOKUP_METHOD) {}

    }

}