From 781417d50f72f832159e35c86dea76df5978434c Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Thu, 27 Oct 2016 19:12:55 -0700 Subject: [PATCH] Add a macro definition --- openssl-sys/src/ossl10x.rs | 6 ++++++ openssl/src/ssl/mod.rs | 6 +----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/openssl-sys/src/ossl10x.rs b/openssl-sys/src/ossl10x.rs index 595b673b..241dc782 100644 --- a/openssl-sys/src/ossl10x.rs +++ b/openssl-sys/src/ossl10x.rs @@ -527,6 +527,12 @@ fn set_id_callback() { #[cfg(not(unix))] fn set_id_callback() {} +// macros +#[cfg(ossl102)] +pub unsafe fn SSL_CTX_set_ecdh_auto(ctx: *mut SSL_CTX, onoff: c_int) -> c_int { + ::SSL_CTX_ctrl(ctx, SSL_CTRL_SET_ECDH_AUTO, onoff as c_long, ::std::ptr::null_mut()) as c_int +} + extern { pub fn BIO_new(type_: *mut BIO_METHOD) -> *mut BIO; pub fn BIO_s_file() -> *mut BIO_METHOD; diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs index a1c39248..071e3137 100644 --- a/openssl/src/ssl/mod.rs +++ b/openssl/src/ssl/mod.rs @@ -551,11 +551,7 @@ impl SslContextBuilder { #[cfg(all(feature = "v102", ossl102))] pub fn set_ecdh_auto(&mut self, onoff: bool) -> Result<(), ErrorStack> { unsafe { - cvt(ffi::SSL_CTX_ctrl(self.as_ptr(), - ffi::SSL_CTRL_SET_ECDH_AUTO, - onoff as c_long, - ptr::null_mut()) as c_int) - .map(|_| ()) + cvt(ffi::SSL_CTX_set_ecdh_auto(self.as_ptr(), onoff as c_int)).map(|_| ()) } }