Skip to content

Commit

Permalink
deps: update rustls v0.20.1 -> v0.21.0
Browse files Browse the repository at this point in the history
This commit updates reqwest to use rustls 0.21.0, both as a direct
dependency and through an update of tokio-rustls to 0.24.0. Additionally
WIP transitive upgrades to hyper-rustls, and quinn are added as patches.

One change is required in the reqwest codebase to adjust the import
location of the `DigtallySignedStruct` type.
  • Loading branch information
cpu committed Mar 31, 2023
1 parent 7047669 commit 3f5109e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
12 changes: 8 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,9 @@ native-tls-crate = { version = "0.2.10", optional = true, package = "native-tls"
tokio-native-tls = { version = "0.3.0", optional = true }

# rustls-tls
hyper-rustls = { version = "0.23", default-features = false, optional = true }
rustls = { version = "0.20", features = ["dangerous_configuration"], optional = true }
tokio-rustls = { version = "0.23", optional = true }
hyper-rustls = { version = "0.24.0", default-features = false, optional = true }
rustls = { version = "0.21.0", features = ["dangerous_configuration"], optional = true }
tokio-rustls = { version = "0.24", optional = true }
webpki-roots = { version = "0.22", optional = true }
rustls-native-certs = { version = "0.6", optional = true }
rustls-pemfile = { version = "1.0", optional = true }
Expand All @@ -142,7 +142,7 @@ trust-dns-resolver = { version = "0.22", optional = true }
# HTTP/3 experimental support
h3 = { version="0.0.1", optional = true }
h3-quinn = { version="0.0.1", optional = true }
quinn = { version = "0.8", default-features = false, features = ["tls-rustls", "ring"], optional = true }
quinn = { version = "0.10", default-features = false, features = ["tls-rustls", "ring"], optional = true }
futures-channel = { version="0.3", optional = true}


Expand Down Expand Up @@ -248,3 +248,7 @@ required-features = ["deflate"]
name = "multipart"
path = "tests/multipart.rs"
required-features = ["multipart"]

[patch.crates-io]
hyper-rustls = { git = 'https://github.com/cpu/hyper-rustls', branch = 'cpu-rustls-0.21.0-prep' }
quinn = { git = 'https://github.com/cpu/quinn', branch = 'cpu-smoke-test-rustls-quic-conns' }
2 changes: 1 addition & 1 deletion src/tls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#[cfg(feature = "__rustls")]
use rustls::{
client::HandshakeSignatureValid, client::ServerCertVerified, client::ServerCertVerifier,
internal::msgs::handshake::DigitallySignedStruct, Error as TLSError, ServerName,
DigitallySignedStruct, Error as TLSError, ServerName,
};
use std::fmt;

Expand Down

0 comments on commit 3f5109e

Please sign in to comment.