aboutsummaryrefslogtreecommitdiff
path: root/openssl-sys-extras/src
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-07-01 18:43:58 -0400
committerSteven Fackler <[email protected]>2016-07-01 18:43:58 -0400
commitb8fb29db5c246175a096260eacca38180cd77dd0 (patch)
tree4fbf3759478b731b3c571ad361023feb6093bbf2 /openssl-sys-extras/src
parentMerge branch 'release-v0.7.13' into release (diff)
parentRelease v0.7.14 (diff)
downloadrust-openssl-0.7.14.tar.xz
rust-openssl-0.7.14.zip
Merge branch 'release-v0.7.14' into releasev0.7.14
Diffstat (limited to 'openssl-sys-extras/src')
-rw-r--r--openssl-sys-extras/src/lib.rs4
-rw-r--r--openssl-sys-extras/src/openssl_shim.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/openssl-sys-extras/src/lib.rs b/openssl-sys-extras/src/lib.rs
index 8b13ade9..8e7542fc 100644
--- a/openssl-sys-extras/src/lib.rs
+++ b/openssl-sys-extras/src/lib.rs
@@ -1,5 +1,5 @@
#![allow(non_upper_case_globals, non_snake_case)]
-#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.13")]
+#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.14")]
extern crate openssl_sys;
extern crate libc;
@@ -60,6 +60,8 @@ extern {
pub fn SSL_CTX_set_options_shim(ctx: *mut SSL_CTX, options: c_long) -> c_long;
pub fn SSL_CTX_get_options_shim(ctx: *mut SSL_CTX) -> c_long;
pub fn SSL_CTX_clear_options_shim(ctx: *mut SSL_CTX, options: c_long) -> c_long;
+ #[link_name = "SSL_CTX_set_mode_shim"]
+ pub fn SSL_CTX_set_mode(ctx: *mut SSL_CTX, options: c_long) -> c_long;
#[link_name = "SSL_CTX_add_extra_chain_cert_shim"]
pub fn SSL_CTX_add_extra_chain_cert(ctx: *mut SSL_CTX, x509: *mut X509) -> c_long;
#[link_name = "SSL_CTX_set_read_ahead_shim"]
diff --git a/openssl-sys-extras/src/openssl_shim.c b/openssl-sys-extras/src/openssl_shim.c
index 11df1ca6..db2a8786 100644
--- a/openssl-sys-extras/src/openssl_shim.c
+++ b/openssl-sys-extras/src/openssl_shim.c
@@ -93,6 +93,10 @@ long SSL_CTX_clear_options_shim(SSL_CTX *ctx, long options) {
return SSL_CTX_clear_options(ctx, options);
}
+long SSL_CTX_set_mode_shim(SSL_CTX *ctx, long options) {
+ return SSL_CTX_set_mode(ctx, options);
+}
+
long SSL_CTX_add_extra_chain_cert_shim(SSL_CTX *ctx, X509 *x509) {
return SSL_CTX_add_extra_chain_cert(ctx, x509);
}