File tree 1 file changed +6
-12
lines changed
1 file changed +6
-12
lines changed Original file line number Diff line number Diff line change 1
- use std:: { pin:: Pin , sync :: Once } ;
1
+ use std:: pin:: Pin ;
2
2
3
3
use openssl:: {
4
4
error:: ErrorStack ,
@@ -45,8 +45,6 @@ pub(super) async fn tls_connect(
45
45
tcp_stream : TcpStream ,
46
46
cfg : & TlsConfig ,
47
47
) -> Result < TlsStream > {
48
- init_trust ( ) ;
49
-
50
48
let mut stream = make_ssl_stream ( host, tcp_stream, cfg) . map_err ( |err| {
51
49
Error :: from ( ErrorKind :: InvalidTlsConfig {
52
50
message : err. to_string ( ) ,
@@ -71,6 +69,11 @@ fn make_openssl_connector(cfg: TlsOptions) -> Result<SslConnector> {
71
69
72
70
let mut builder = SslConnector :: builder ( SslMethod :: tls_client ( ) ) . map_err ( openssl_err) ?;
73
71
72
+ let probe = openssl_probe:: probe ( ) ;
73
+ builder
74
+ . load_verify_locations ( probe. cert_file . as_deref ( ) , probe. cert_dir . as_deref ( ) )
75
+ . map_err ( openssl_err) ?;
76
+
74
77
let TlsOptions {
75
78
allow_invalid_certificates,
76
79
ca_file_path,
@@ -111,15 +114,6 @@ fn make_openssl_connector(cfg: TlsOptions) -> Result<SslConnector> {
111
114
Ok ( builder. build ( ) )
112
115
}
113
116
114
- fn init_trust ( ) {
115
- static ONCE : Once = Once :: new ( ) ;
116
- // nosemgrep: unsafe-usage
117
- ONCE . call_once ( || unsafe {
118
- // mongodb rating: No Fix Needed
119
- openssl_probe:: init_openssl_env_vars ( )
120
- } )
121
- }
122
-
123
117
fn make_ssl_stream (
124
118
host : & str ,
125
119
tcp_stream : TcpStream ,
You can’t perform that action at this time.
0 commit comments