aboutsummaryrefslogtreecommitdiff
path: root/openssl
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-08-04 22:52:40 -0700
committerSteven Fackler <[email protected]>2016-08-04 22:52:40 -0700
commitc47be8b14b43afff4b99c771688accb3e47982ff (patch)
tree34e3c5e7197e7bf7861e13febf151899569c952e /openssl
parentMvoe SSL_CTX_add_extra_chain_cert to -sys (diff)
downloadrust-openssl-c47be8b14b43afff4b99c771688accb3e47982ff.tar.xz
rust-openssl-c47be8b14b43afff4b99c771688accb3e47982ff.zip
Move SSL_CTX_set_ecdh_auto to -sys
Diffstat (limited to 'openssl')
-rw-r--r--openssl/Cargo.toml2
-rw-r--r--openssl/src/ssl/mod.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml
index 3d4b098c..4f7243b9 100644
--- a/openssl/Cargo.toml
+++ b/openssl/Cargo.toml
@@ -23,7 +23,7 @@ aes_ctr = ["openssl-sys/aes_ctr"]
npn = ["openssl-sys/npn"]
alpn = ["openssl-sys/alpn"]
rfc5114 = ["openssl-sys/rfc5114"]
-ecdh_auto = ["openssl-sys-extras/ecdh_auto"]
+ecdh_auto = ["openssl-sys/ecdh_auto"]
pkcs5_pbkdf2_hmac = ["openssl-sys/pkcs5_pbkdf2_hmac"]
[dependencies]
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index 48e9f1c8..8cfc209a 100644
--- a/openssl/src/ssl/mod.rs
+++ b/openssl/src/ssl/mod.rs
@@ -625,7 +625,7 @@ impl SslContext {
/// This method requires OpenSSL >= 1.0.2 or LibreSSL and the `ecdh_auto` feature.
#[cfg(feature = "ecdh_auto")]
pub fn set_ecdh_auto(&mut self, onoff: bool) -> Result<(), ErrorStack> {
- wrap_ssl_result(unsafe { ::ffi_extras::SSL_CTX_set_ecdh_auto(self.ctx, onoff as c_int) })
+ wrap_ssl_result(unsafe { ffi::SSL_CTX_set_ecdh_auto(self.ctx, onoff as c_long) as c_int })
}
pub fn set_options(&mut self, option: SslContextOptions) -> SslContextOptions {