Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade hyper-rustls #1977

Merged
merged 2 commits into from Apr 20, 2022
Merged

Upgrade hyper-rustls #1977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df31792
Upgrade hyper-rustls
TethysSvensson Dec 24, 2021
f7c92c3
add the new hyper-rustls default features
iliana Apr 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

(Please put changes here.)
- Update `hyper-rustls` to `0.23`

## [0.47.0] - 2021-06-29

Expand Down
2 changes: 1 addition & 1 deletion rusoto/core/Cargo.toml
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@ crc32fast = "1.2"
futures = "0.3"
http = "0.2"
hyper = { version = "0.14", features = ["client", "http1", "http2", "tcp"] }
hyper-rustls = { version = "0.22", optional = true, default-dependencies = false }
hyper-rustls = { version = "0.23", optional = true, default-dependencies = false, features = [ "http1", "http2", "tls12", "logging" ] }
hyper-tls = { version = "0.5.0", optional = true }
lazy_static = "1.4"
log = "0.4"
Expand Down
28 changes: 20 additions & 8 deletions rusoto/core/src/request.rs
View file
Open in desktop
Expand Up @@ -223,11 +223,17 @@ impl HttpClient {
#[cfg(feature = "native-tls")]
let connector = HttpsConnector::new();

#[cfg(all(feature = "rustls", not(feature = "rustls-webpki")))]
let connector = HttpsConnector::with_native_roots();
#[cfg(feature = "rustls")]
let connector = {
let builder = crate::tls::HttpsConnectorBuilder::new();

#[cfg(feature = "rustls-webpki")]
let connector = HttpsConnector::with_webpki_roots();
#[cfg(not(feature = "rustls-webpki"))]
let builder = builder.with_native_roots();
#[cfg(feature = "rustls-webpki")]
let builder = builder.with_webpki_roots();

builder.https_only().enable_http2().build()
};

Ok(Self::from_connector(connector))
}
Expand All @@ -237,11 +243,17 @@ impl HttpClient {
#[cfg(feature = "native-tls")]
let connector = HttpsConnector::new();

#[cfg(all(feature = "rustls", not(feature = "rustls-webpki")))]
let connector = HttpsConnector::with_native_roots();
#[cfg(feature = "rustls")]
let connector = {
let builder = crate::tls::HttpsConnectorBuilder::new();

#[cfg(feature = "rustls-webpki")]
let connector = HttpsConnector::with_webpki_roots();
#[cfg(not(feature = "rustls-webpki"))]
let builder = builder.with_native_roots();
#[cfg(feature = "rustls-webpki")]
let builder = builder.with_webpki_roots();

builder.https_only().enable_http2().build()
};

Ok(Self::from_connector_with_config(connector, config))
}
Expand Down