3 files changed, 4 insertions, 30 deletions
diff --git a/openssl-sys-extras/Cargo.toml b/openssl-sys-extras/Cargo.toml
index c655f6fe..14f09247 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.10"
+version = "0.7.11"
 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.10/openssl_sys_extras"
+documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.11/openssl_sys_extras"
 build = "build.rs"
 
 [features]
@@ -13,7 +13,7 @@ ecdh_auto = []
 
 [dependencies]
 libc = "0.2"
-openssl-sys = { version = "0.7.10", path = "../openssl-sys" }
+openssl-sys = { version = "0.7.11", 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 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)