diff options
| author | Steven Fackler <[email protected]> | 2016-08-04 22:46:47 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2016-08-04 22:46:47 -0700 |
| commit | ee67ea8ea08c95697b286487f4585ff03e5fd382 (patch) | |
| tree | ef78d0ef548b7f9433f9f1e5213cd6861ffbcdd0 | |
| parent | Move SSL_CTX_set_tmp_dh to -sys (diff) | |
| download | rust-openssl-ee67ea8ea08c95697b286487f4585ff03e5fd382.tar.xz rust-openssl-ee67ea8ea08c95697b286487f4585ff03e5fd382.zip | |
Mvoe SSL_CTX_add_extra_chain_cert to -sys
| -rw-r--r-- | openssl-sys/src/lib.rs | 4 | ||||
| -rw-r--r-- | openssl/src/ssl/mod.rs | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index 95c0fe92..f13a3dd5 100644 --- a/openssl-sys/src/lib.rs +++ b/openssl-sys/src/lib.rs @@ -540,6 +540,10 @@ pub unsafe fn SSL_CTX_set_tmp_dh(ctx: *mut SSL_CTX, dh: *mut DH) -> c_long { SSL_CTX_ctrl(ctx, SSL_CTRL_SET_TMP_DH, 0, dh as *mut c_void) } +pub unsafe fn SSL_CTX_add_extra_chain_cert(ctx: *mut SSL_CTX, x509: *mut X509) -> c_long { + SSL_CTX_ctrl(ctx, SSL_CTRL_EXTRA_CHAIN_CERT, 0, x509 as *mut c_void) +} + pub unsafe fn SSL_CTX_set_tlsext_servername_callback(ctx: *mut SSL_CTX, cb: Option<extern "C" fn()>) -> c_long { diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs index 21764bfb..48e9f1c8 100644 --- a/openssl/src/ssl/mod.rs +++ b/openssl/src/ssl/mod.rs @@ -20,7 +20,6 @@ use std::slice; use std::marker::PhantomData; use ffi; -use ffi_extras; use dh::DH; use x509::{X509StoreContext, X509FileType, X509}; use crypto::pkey::PKey; @@ -586,7 +585,7 @@ impl SslContext { /// certificate specified using set_certificate() pub fn add_extra_chain_cert(&mut self, cert: &X509) -> Result<(), ErrorStack> { wrap_ssl_result(unsafe { - ffi_extras::SSL_CTX_add_extra_chain_cert(self.ctx, cert.get_handle()) as c_int + ffi::SSL_CTX_add_extra_chain_cert(self.ctx, cert.get_handle()) as c_int }) } @@ -626,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_extras::SSL_CTX_set_ecdh_auto(self.ctx, onoff as c_int) }) } pub fn set_options(&mut self, option: SslContextOptions) -> SslContextOptions { |