diff options
| author | Steven Fackler <[email protected]> | 2018-05-12 14:15:54 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-05-12 14:15:54 +0100 |
| commit | af5a7178cbdfd6b04006eb221d1caefe3eaec61e (patch) | |
| tree | d316ce0a8e1163ee68f36efbc68426e10b614812 /openssl-sys/src/lib.rs | |
| parent | Merge pull request #913 from sfackler/fix-get-version (diff) | |
| parent | Disable tests that talk to Google on LibreSSL 2.5.0 (diff) | |
| download | rust-openssl-af5a7178cbdfd6b04006eb221d1caefe3eaec61e.tar.xz rust-openssl-af5a7178cbdfd6b04006eb221d1caefe3eaec61e.zip | |
Merge pull request #915 from sfackler/callback-cleanup
Change SslContext callback handling
Diffstat (limited to 'openssl-sys/src/lib.rs')
| -rw-r--r-- | openssl-sys/src/lib.rs | 8 |
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, |