File tree 2 files changed +8
-1
lines changed
2 files changed +8
-1
lines changed Original file line number Diff line number Diff line change @@ -101,8 +101,13 @@ pub fn init() {
101
101
// explicitly initialize to work around https://github.com/openssl/openssl/issues/3505
102
102
static INIT : Once = Once :: new ( ) ;
103
103
104
+ #[ cfg( not( ossl111b) ) ]
105
+ let init_options = OPENSSL_INIT_LOAD_SSL_STRINGS ;
106
+ #[ cfg( ossl111b) ]
107
+ let init_options = OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_NO_ATEXIT ;
108
+
104
109
INIT . call_once ( || unsafe {
105
- OPENSSL_init_ssl ( OPENSSL_INIT_LOAD_SSL_STRINGS , ptr:: null_mut ( ) ) ;
110
+ OPENSSL_init_ssl ( init_options , ptr:: null_mut ( ) ) ;
106
111
} )
107
112
}
108
113
Original file line number Diff line number Diff line change @@ -1398,6 +1398,8 @@ cfg_if! {
1398
1398
1399
1399
#[ cfg( ossl110) ]
1400
1400
pub const OPENSSL_INIT_LOAD_SSL_STRINGS : u64 = 0x00200000 ;
1401
+ #[ cfg( ossl111b) ]
1402
+ pub const OPENSSL_INIT_NO_ATEXIT : u64 = 0x00080000 ;
1401
1403
1402
1404
extern "C" {
1403
1405
#[ cfg( ossl110) ]
You can’t perform that action at this time.
0 commit comments