Pull in new rustls-platform-verifier

rustls · Mar 25, 2024 · cdf1343 · cdf1343
1 parent f572300
commit cdf1343
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -56,18 +56,18 @@ jobs:
         env:
           RUST_BACKTRACE: 1
 
-      - name: cargo test (debug; native-tokio only)
-        run: cargo test --no-default-features --features native-tokio
+      - name: cargo test (debug; native-tokio)
+        run: cargo test --no-default-features --features native-tokio,aws-lc-rs
         env:
           RUST_BACKTRACE: 1
 
-      - name: cargo test (debug; webpki-tokio only)
-        run: cargo test --no-default-features --features webpki-tokio
+      - name: cargo test (debug; webpki-tokio)
+        run: cargo test --no-default-features --features webpki-tokio,aws-lc-rs
         env:
           RUST_BACKTRACE: 1
 
-      - name: cargo test (debug; all features)
-        run: cargo test --all-features
+      - name: cargo test (debug; http)
+        run: cargo test -F http1,http2
         env:
           RUST_BACKTRACE: 1
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -17,7 +17,7 @@ hyper-util = { version = "0.1", default-features = false, features = ["client-le
 log = { version = "0.4.4", optional = true }
 pki-types = { package = "rustls-pki-types", version = "1" }
 rustls-native-certs = { version = "0.7", optional = true }
-rustls-platform-verifier = { version = "0.2", optional = true }
+rustls-platform-verifier = { version = "0.3", optional = true }
 rustls = { version = "0.23", default-features = false }
 tokio = "1.0"
 tokio-rustls = { version = "0.26", default-features = false }
@@ -33,8 +33,9 @@ rustls-pemfile = "2"
 tokio = { version = "1.0", features = ["io-std", "macros", "net", "rt-multi-thread"] }
 
 [features]
-default = ["native-tokio", "http1", "tls12", "logging", "ring"]
-aws-lc-rs = ["rustls/aws_lc_rs"]
+default = ["native-tokio", "http1", "tls12", "logging", "aws_lc_rs"]
+aws_lc_rs = ["rustls/aws_lc_rs"]
+aws-lc-rs = ["aws_lc_rs"] # Alias because Cargo features commonly use `-`
 http1 = ["hyper-util/http1"]
 http2 = ["hyper-util/http2"]
 webpki-tokio = ["webpki-roots"]

diff --git a/src/connector/builder.rs b/src/connector/builder.rs
@@ -54,7 +54,7 @@ impl ConnectorBuilder<WantsTlsConfig> {
     /// Use rustls' default crypto provider and other defaults, and the platform verifier
     ///
     /// See [`ConfigBuilderExt::with_platform_verifier()`].
-    #[cfg(all(feature = "ring", feature = "rustls-platform-verifier"))]
+    #[cfg(feature = "rustls-platform-verifier")]
     pub fn with_platform_verifier(self) -> ConnectorBuilder<WantsSchemes> {
         self.with_tls_config(
             ClientConfig::builder()
@@ -67,7 +67,7 @@ impl ConnectorBuilder<WantsTlsConfig> {
     /// native roots.
     ///
     /// See [`ConfigBuilderExt::with_native_roots`]
-    #[cfg(all(feature = "ring", feature = "rustls-native-certs"))]
+    #[cfg(feature = "rustls-native-certs")]
     pub fn with_native_roots(self) -> std::io::Result<ConnectorBuilder<WantsSchemes>> {
         Ok(self.with_tls_config(
             ClientConfig::builder()
@@ -97,7 +97,7 @@ impl ConnectorBuilder<WantsTlsConfig> {
     /// safe defaults.
     ///
     /// See [`ConfigBuilderExt::with_webpki_roots`]
-    #[cfg(all(feature = "ring", feature = "webpki-roots"))]
+    #[cfg(feature = "webpki-roots")]
     pub fn with_webpki_roots(self) -> ConnectorBuilder<WantsSchemes> {
         self.with_tls_config(
             ClientConfig::builder()