Make openssl not cleanup at exit, which can lead to race conditions.

Fixes #1293.
sfackler · Jul 27, 2020 · 7f8a970 · 7f8a970
1 parent 5cf2c2d
commit 7f8a970
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
@@ -102,7 +102,10 @@ pub fn init() {
     static INIT: Once = Once::new();
 
     INIT.call_once(|| unsafe {
-        OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, ptr::null_mut());
+        OPENSSL_init_ssl(
+            OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_NO_ATEXIT,
+            ptr::null_mut(),
+        );
     })
 }
 

diff --git a/openssl-sys/src/ssl.rs b/openssl-sys/src/ssl.rs
@@ -1398,6 +1398,8 @@ cfg_if! {
 
 #[cfg(ossl110)]
 pub const OPENSSL_INIT_LOAD_SSL_STRINGS: u64 = 0x00200000;
+#[cfg(ossl110)]
+pub const OPENSSL_INIT_NO_ATEXIT: u64 = 0x00080000;
 
 extern "C" {
     #[cfg(ossl110)]