diff options
| author | Steven Fackler <[email protected]> | 2015-10-05 20:39:03 +0100 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2015-10-05 20:39:03 +0100 |
| commit | 201624a32dfa0bc5d47d22280ad0fc11cbe8ea8b (patch) | |
| tree | 752164b5a4f61dde2ae70a8fcc8815ac05e3bfa0 /openssl-sys/src/lib.rs | |
| parent | Merge pull request #279 from jtdowney/sslv23_docs (diff) | |
| parent | Set threadid_func on linux/osx (fixes #281) (diff) | |
| download | rust-openssl-201624a32dfa0bc5d47d22280ad0fc11cbe8ea8b.tar.xz rust-openssl-201624a32dfa0bc5d47d22280ad0fc11cbe8ea8b.zip | |
Merge pull request #282 from Manishearth/threadid
Set threadid_func on linux/osx (fixes #281)
Diffstat (limited to 'openssl-sys/src/lib.rs')
| -rw-r--r-- | openssl-sys/src/lib.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index 45d03ac8..e5dfdc82 100644 --- a/openssl-sys/src/lib.rs +++ b/openssl-sys/src/lib.rs @@ -270,6 +270,7 @@ pub fn init() { GUARDS = mem::transmute(guards); CRYPTO_set_locking_callback(locking_function); + unsafe{ rust_openssl_set_id_callback(); } }) } } @@ -290,6 +291,7 @@ pub unsafe fn SSL_CTX_clear_options(ssl: *mut SSL_CTX, op: u64) -> u64 { extern "C" { fn rust_openssl_ssl_ctx_options_rust_to_c(rustval: u64) -> c_long; fn rust_openssl_ssl_ctx_options_c_to_rust(cval: c_long) -> u64; + fn rust_openssl_set_id_callback(); pub fn ASN1_INTEGER_set(dest: *mut ASN1_INTEGER, value: c_long) -> c_int; pub fn ASN1_STRING_type_new(ty: c_int) -> *mut ASN1_STRING; |