talksik/tonic
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Johan Andersson
2020-03-30 10:01:48 -04:00
committed by GitHub
parent cfd59dbb34
commit 25569e007b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tonic/Cargo.toml
+3 -3
View File
@@ -47,7 +47,7 @@ futures-core = { version = "0.3", default-features = false }
futures-util = { version = "0.3", default-features = false } futures-util = { version = "0.3", default-features = false }
tracing = "0.1" tracing = "0.1"
http = "0.2" http = "0.2"
base64 = "0.10" base64 = "0.11"
percent-encoding = "2.0" percent-encoding = "2.0"
tower-service = "0.3" tower-service = "0.3"
@@ -73,8 +73,8 @@ tower-load = { version = "0.3", optional = true }
tracing-futures = { version = "0.2", optional = true } tracing-futures = { version = "0.2", optional = true }
# rustls # rustls
tokio-rustls = { version = "0.12", optional = true } tokio-rustls = { version = "0.13", optional = true }
rustls-native-certs = { version = "0.1", optional = true } rustls-native-certs = { version = "0.3", optional = true }
[dev-dependencies] [dev-dependencies]
tokio = { version = "0.2", features = ["rt-core", "macros"] } tokio = { version = "0.2", features = ["rt-core", "macros"] }
tonic/src/transport/service/tls.rs
+2 -2
View File
@@ -50,12 +50,12 @@ impl TlsConnector {
if let Some(identity) = identity { if let Some(identity) = identity {
let (client_cert, client_key) = rustls_keys::load_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")] #[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 { if let Some(cert) = ca_cert {