chore(transport): Upgrade rustls and base64 (#251)

hyperium · Mar 30, 2020 · 25569e0 · 25569e0
1 parent cfd59db
commit 25569e0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/tonic/Cargo.toml b/tonic/Cargo.toml
@@ -47,7 +47,7 @@ futures-core = { version = "0.3", default-features = false }
 futures-util = { version = "0.3", default-features = false }
 tracing = "0.1"
 http = "0.2"
-base64 = "0.10"
+base64 = "0.11"
 
 percent-encoding = "2.0"
 tower-service = "0.3"
@@ -73,8 +73,8 @@ tower-load = { version = "0.3", optional = true }
 tracing-futures = { version = "0.2", optional = true }
 
 # rustls
-tokio-rustls = { version = "0.12", optional = true }
-rustls-native-certs = { version = "0.1", optional = true }
+tokio-rustls = { version = "0.13", optional = true }
+rustls-native-certs = { version = "0.3", optional = true }
 
 [dev-dependencies]
 tokio = { version = "0.2", features = ["rt-core", "macros"] }

diff --git a/tonic/src/transport/service/tls.rs b/tonic/src/transport/service/tls.rs
@@ -50,12 +50,12 @@ impl TlsConnector {
 
         if let Some(identity) = identity {
             let (client_cert, client_key) = rustls_keys::load_identity(identity)?;
-            config.set_single_client_cert(client_cert, client_key);
+            config.set_single_client_cert(client_cert, client_key)?;
         }
 
         #[cfg(feature = "tls-roots")]
         {
-            config.root_store = rustls_native_certs::load_native_certs()?;
+            config.root_store = rustls_native_certs::load_native_certs().map_err(|(_, e)| e)?;
         }
 
         if let Some(cert) = ca_cert {