From 73451070db6fba544d515065c4db10062d0635f9 Mon Sep 17 00:00:00 2001 From: asonix Date: Sun, 12 May 2024 16:09:59 -0500 Subject: [PATCH] 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 --- actix-tls/Cargo.toml | 4 ++-- actix-tls/tests/accept-openssl.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) mode change 100755 => 100644 actix-tls/Cargo.toml diff --git a/actix-tls/Cargo.toml b/actix-tls/Cargo.toml old mode 100755 new mode 100644 index f0dfaf81f..8fce28360 --- 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 index ecafbf763..217e8e5d2 100644 --- 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::crypto::ring::default_provider() + rustls::crypto::aws_lc_rs::default_provider() .signature_verification_algorithms .supported_schemes() }