diff options
Diffstat (limited to 'ext')
-rw-r--r-- | ext/net/ops_tls.rs | 7 | ||||
-rw-r--r-- | ext/websocket/lib.rs | 11 |
2 files changed, 8 insertions, 10 deletions
diff --git a/ext/net/ops_tls.rs b/ext/net/ops_tls.rs index 255c6ddbd..d16bface4 100644 --- a/ext/net/ops_tls.rs +++ b/ext/net/ops_tls.rs @@ -27,7 +27,6 @@ use deno_tls::create_client_config; use deno_tls::load_certs; use deno_tls::load_private_keys; use deno_tls::rustls::Certificate; -use deno_tls::rustls::ClientConnection; use deno_tls::rustls::PrivateKey; use deno_tls::rustls::ServerConfig; use deno_tls::rustls::ServerName; @@ -231,7 +230,8 @@ where let tls_config = Arc::new(tls_config); let tls_stream = TlsStream::new_client_side( tcp_stream, - ClientConnection::new(tls_config, hostname_dns).unwrap(), + tls_config, + hostname_dns, TLS_BUFFER_SIZE, ); @@ -327,7 +327,8 @@ where let tls_stream = TlsStream::new_client_side( tcp_stream, - ClientConnection::new(tls_config, hostname_dns).unwrap(), + tls_config, + hostname_dns, TLS_BUFFER_SIZE, ); diff --git a/ext/websocket/lib.rs b/ext/websocket/lib.rs index 60b0911b1..4b544b4f8 100644 --- a/ext/websocket/lib.rs +++ b/ext/websocket/lib.rs @@ -23,7 +23,6 @@ use deno_core::ToJsBuffer; use deno_net::raw::NetworkStream; use deno_tls::create_client_config; use deno_tls::rustls::ClientConfig; -use deno_tls::rustls::ClientConnection; use deno_tls::RootCertStoreProvider; use deno_tls::SocketUse; use http::header::CONNECTION; @@ -237,7 +236,8 @@ async fn handshake_http1_wss( ServerName::try_from(domain).map_err(|_| invalid_hostname(domain))?; let mut tls_connector = TlsStream::new_client_side( tcp_socket, - ClientConnection::new(tls_config.into(), dnsname).unwrap(), + tls_config.into(), + dnsname, NonZeroUsize::new(65536), ); // If we can bail on an http/1.1 ALPN mismatch here, we can avoid doing extra work @@ -261,11 +261,8 @@ async fn handshake_http2_wss( let dnsname = ServerName::try_from(domain).map_err(|_| invalid_hostname(domain))?; // We need to better expose the underlying errors here - let mut tls_connector = TlsStream::new_client_side( - tcp_socket, - ClientConnection::new(tls_config.into(), dnsname).unwrap(), - None, - ); + let mut tls_connector = + TlsStream::new_client_side(tcp_socket, tls_config.into(), dnsname, None); let handshake = tls_connector.handshake().await?; if handshake.alpn.is_none() { bail!("Didn't receive h2 alpn, aborting connection"); |