diff options
| author | Steven Fackler <[email protected]> | 2016-07-01 18:43:58 -0400 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2016-07-01 18:43:58 -0400 |
| commit | b8fb29db5c246175a096260eacca38180cd77dd0 (patch) | |
| tree | 4fbf3759478b731b3c571ad361023feb6093bbf2 /openssl-sys-extras | |
| parent | Merge branch 'release-v0.7.13' into release (diff) | |
| parent | Release v0.7.14 (diff) | |
| download | rust-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')
| -rw-r--r-- | openssl-sys-extras/Cargo.toml | 6 | ||||
| -rw-r--r-- | openssl-sys-extras/src/lib.rs | 4 | ||||
| -rw-r--r-- | openssl-sys-extras/src/openssl_shim.c | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/openssl-sys-extras/Cargo.toml b/openssl-sys-extras/Cargo.toml index a8283103..903305d7 100644 --- a/openssl-sys-extras/Cargo.toml +++ b/openssl-sys-extras/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "openssl-sys-extras" -version = "0.7.13" +version = "0.7.14" authors = ["Steven Fackler <[email protected]>"] license = "MIT" description = "Extra FFI bindings to OpenSSL that require a C shim" repository = "https://github.com/sfackler/rust-openssl" -documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.13/openssl_sys_extras" +documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.14/openssl_sys_extras" build = "build.rs" [features] @@ -13,7 +13,7 @@ ecdh_auto = [] [dependencies] libc = "0.2" -openssl-sys = { version = "0.7.13", path = "../openssl-sys" } +openssl-sys = { version = "0.7.14", path = "../openssl-sys" } [build-dependencies] gcc = "0.3" 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); } |