Merge pull request #95 from benashford/upgrade_rustls

Upgrade Rustls

Author: benashford

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "redis-async"
-version = "0.17.1"
+version = "0.17.2"
 authors = ["Ben Ashford <benashford@users.noreply.github.com>"]
 license = "MIT/Apache-2.0"
 readme = "README.md"
@@ -20,9 +20,9 @@ pin-project = "1.0"
 socket2 = { version = "0.5", features = ["all"] }
 tokio = { version = "1.0", features = ["rt", "net", "time"] }
 tokio-native-tls = { version = "0.3.0", optional = true }
-tokio-rustls = { version = "0.24", optional = true }
+tokio-rustls = { version = "0.26", optional = true }
 tokio-util = { version = "0.7", features = ["codec"] }
-webpki-roots = { version = "0.23", optional = true }
+webpki-roots = { version = "0.26", optional = true }
 
 [features]
 default = []

src/client/connect.rs

@@ -132,20 +132,13 @@ pub async fn connect_tls(
 ) -> Result<RespConnection, error::Error> {
     use std::sync::Arc;
     use tokio_rustls::{
-        rustls::{ClientConfig, OwnedTrustAnchor, RootCertStore},
+        rustls::{ClientConfig, RootCertStore},
         TlsConnector,
     };
 
     let mut root_store = RootCertStore::empty();
-    root_store.add_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.0.iter().map(|ta| {
-        OwnedTrustAnchor::from_subject_spki_name_constraints(
-            ta.subject,
-            ta.spki,
-            ta.name_constraints,
-        )
-    }));
+    root_store.extend(webpki_roots::TLS_SERVER_ROOTS.iter().cloned());
     let config = ClientConfig::builder()
-        .with_safe_defaults()
         .with_root_certificates(root_store)
         .with_no_client_auth();
     let connector = TlsConnector::from(Arc::new(config));
@@ -161,7 +154,8 @@ pub async fn connect_tls(
 
     let stream = connector
         .connect(
-            host.try_into()
+            String::from(host)
+                .try_into()
                 .map_err(|_err| error::Error::InvalidDnsName)?,
             tcp_stream,
         )