actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2025-06-29 13:54:58 +02:00
Code Issues Releases Wiki Activity

Use tokio-rustls 0.23 (#396)

Browse Source 
Co-authored-by: Rob Ede <robjtede@icloud.com>
This commit is contained in:
Edward Shen
2021-10-19 08:48:23 -07:00
committed by GitHub
parent 47f278b17a
commit 669e868370
5 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
actix-tls/src/connect/ssl/rustls.rs
View File

@ -1,4 +1,5 @@
use std::{
convert::TryFrom,
future::Future,
io,
pin::Pin,
@ -6,7 +7,6 @@ use std::{
task::{Context, Poll},
};
pub use tokio_rustls::rustls::Session;
pub use tokio_rustls::{client::TlsStream, rustls::ClientConfig};
pub use webpki_roots::TLS_SERVER_ROOTS;
@ -14,7 +14,7 @@ use actix_rt::net::ActixStream;
use actix_service::{Service, ServiceFactory};
use futures_core::{future::LocalBoxFuture, ready};
use log::trace;
use tokio_rustls::webpki::DNSNameRef;
use tokio_rustls::rustls::client::ServerName;
use tokio_rustls::{Connect, TlsConnector};
use crate::connect::{Address, Connection};
@ -89,7 +89,7 @@ where
trace!("SSL Handshake start for: {:?}", connection.host());
let (stream, connection) = connection.replace_io(());
match DNSNameRef::try_from_ascii_str(connection.host()) {
match ServerName::try_from(connection.host()) {
Ok(host) => RustlsConnectorServiceFuture::Future {
connect: TlsConnector::from(self.connector.clone()).connect(host, stream),
connection: Some(connection),