aboutsummaryrefslogtreecommitdiff
path: root/openssl-sys
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2018-05-12 12:57:46 +0100
committerSteven Fackler <[email protected]>2018-05-12 13:19:01 +0100
commite5d65306e7609d710fa3c7b00d97e88ddc33f72f (patch)
treef64d93e9a919818ede1b1d727ebfc92306515d74 /openssl-sys
parentMerge pull request #913 from sfackler/fix-get-version (diff)
downloadrust-openssl-e5d65306e7609d710fa3c7b00d97e88ddc33f72f.tar.xz
rust-openssl-e5d65306e7609d710fa3c7b00d97e88ddc33f72f.zip
Change SslContext callback handling
Use the existing infrastructure!
Diffstat (limited to 'openssl-sys')
-rw-r--r--openssl-sys/src/lib.rs8
1 files changed, 7 insertions, 1 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index d7f09cec..0a7d47c0 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -2635,7 +2635,11 @@ extern "C" {
pub fn SSL_SESSION_free(s: *mut SSL_SESSION);
pub fn SSL_SESSION_get_id(s: *const SSL_SESSION, len: *mut c_uint) -> *const c_uchar;
- pub fn d2i_SSL_SESSION(a: *mut *mut SSL_SESSION, pp: *mut *const c_uchar, len: c_long) -> *mut SSL_SESSION;
+ pub fn d2i_SSL_SESSION(
+ a: *mut *mut SSL_SESSION,
+ pp: *mut *const c_uchar,
+ len: c_long,
+ ) -> *mut SSL_SESSION;
pub fn i2d_SSL_SESSION(s: *mut SSL_SESSION, pp: *mut *mut c_uchar) -> c_int;
#[cfg(not(ossl101))]
@@ -2857,6 +2861,7 @@ extern "C" {
#[cfg(not(libressl))]
pub fn FIPS_mode() -> c_int;
+ // FIXME change to unsafe extern "C" fn
pub fn SSL_CTX_set_cookie_generate_cb(
s: *mut SSL_CTX,
cb: Option<
@@ -2864,6 +2869,7 @@ extern "C" {
>,
);
+ // FIXME change to unsafe extern "C" fn
#[cfg(ossl110)]
pub fn SSL_CTX_set_cookie_verify_cb(
s: *mut SSL_CTX,