actix-tls: Disable default features for rustls 0.23 via tokio-rustls …

…0.26 (#560) * actix-tls: Disable default features for rustls 0.23 via tokio-rustls 0.26 This also fixes a panic in accept-rustls due to both ring and aws-lc-rs being enabled for that example * Switch a test from aws-lc-rs to ring since aws-lc-rs is no longer enabled in dev-dependencies * Switch another test from aws-lc-rs to ring since aws-lc-rs is no longer enabled in dev-dependencies * Go the other way - use aws_lc_rs instead of ring --------- Co-authored-by: Rob Ede <robjtede@icloud.com>
actix · May 12, 2024 · 7345107 · 7345107
1 parent 2632c98
commit 7345107
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/actix-tls/Cargo.toml b/actix-tls/Cargo.toml
@@ -108,7 +108,7 @@ tokio-rustls-025 = { package = "tokio-rustls", version = "0.25", optional = true
 webpki-roots-026 = { package = "webpki-roots", version = "0.26", optional = true } # Also used for rustls v0.23
 
 # rustls v0.23
-tokio-rustls-026 = { package = "tokio-rustls", version = "0.26", optional = true }
+tokio-rustls-026 = { package = "tokio-rustls", version = "0.26", default-features = false, optional = true }
 
 # native root certificates for rustls impls
 rustls-native-certs-06 = { package = "rustls-native-certs", version = "0.6", optional = true }
@@ -127,7 +127,7 @@ futures-util = { version = "0.3.17", default-features = false, features = ["sink
 itertools = "0.12"
 rcgen = "0.12"
 rustls-pemfile = "2"
-tokio-rustls-026 = { package = "tokio-rustls", version = "0.26", features = ["ring"] }
+tokio-rustls-026 = { package = "tokio-rustls", version = "0.26" }
 trust-dns-resolver = "0.23"
 
 [[example]]

diff --git a/actix-tls/tests/accept-openssl.rs b/actix-tls/tests/accept-openssl.rs
@@ -88,7 +88,7 @@ mod danger {
         }
 
         fn supported_verify_schemes(&self) -> Vec<rustls::SignatureScheme> {
-            rustls::crypto::ring::default_provider()
+            rustls::crypto::aws_lc_rs::default_provider()
                 .signature_verification_algorithms
                 .supported_schemes()
         }