diff options
| author | Steven Fackler <[email protected]> | 2016-05-05 13:32:41 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2016-05-05 13:32:41 -0700 |
| commit | 4294511f2ba9fe7ec6860f0c783498d93ea68fd9 (patch) | |
| tree | df813ae00076c59fd6cb4b7d61bc5f5e76b4f680 /openssl-sys-extras/src | |
| parent | Merge branch 'release-v0.7.10' into release (diff) | |
| parent | Release v0.7.11 (diff) | |
| download | rust-openssl-0.7.11.tar.xz rust-openssl-0.7.11.zip | |
Merge branch 'release-v0.7.11' into releasev0.7.11
Diffstat (limited to 'openssl-sys-extras/src')
| -rw-r--r-- | openssl-sys-extras/src/lib.rs | 2 | ||||
| -rw-r--r-- | openssl-sys-extras/src/openssl_shim.c | 26 |
2 files changed, 1 insertions, 27 deletions
diff --git a/openssl-sys-extras/src/lib.rs b/openssl-sys-extras/src/lib.rs index 97dc0c2b..a2acbd55 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.10")] +#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.11")] extern crate openssl_sys; extern crate libc; diff --git a/openssl-sys-extras/src/openssl_shim.c b/openssl-sys-extras/src/openssl_shim.c index a4b40280..11df1ca6 100644 --- a/openssl-sys-extras/src/openssl_shim.c +++ b/openssl-sys-extras/src/openssl_shim.c @@ -3,32 +3,6 @@ #include <openssl/dh.h> #include <openssl/bn.h> -#if defined(__APPLE__) || defined(__linux) - -#include <pthread.h> -#include <openssl/crypto.h> - -unsigned long thread_id() -{ - return (unsigned long) pthread_self(); -} - -void rust_openssl_set_id_callback() { - CRYPTO_set_id_callback(thread_id); -} - -#else -// Openssl already handles Windows directly, so we don't -// need to explicitly set it - -void rust_openssl_set_id_callback() { - // We don't know how to set the callback for arbitrary OSes - // Let openssl use its defaults and hope they work. -} - -#endif - - #if OPENSSL_VERSION_NUMBER < 0x10000000L // Copied from openssl crypto/hmac/hmac.c int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx) |