Skip to content

Commit 7345107

Browse files
asonixrobjtede
andauthored
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 <[email protected]>
1 parent 2632c98 commit 7345107

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

actix-tls/Cargo.toml

100755100644
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ tokio-rustls-025 = { package = "tokio-rustls", version = "0.25", optional = true
108108
webpki-roots-026 = { package = "webpki-roots", version = "0.26", optional = true } # Also used for rustls v0.23
109109

110110
# rustls v0.23
111-
tokio-rustls-026 = { package = "tokio-rustls", version = "0.26", optional = true }
111+
tokio-rustls-026 = { package = "tokio-rustls", version = "0.26", default-features = false, optional = true }
112112

113113
# native root certificates for rustls impls
114114
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
127127
itertools = "0.12"
128128
rcgen = "0.12"
129129
rustls-pemfile = "2"
130-
tokio-rustls-026 = { package = "tokio-rustls", version = "0.26", features = ["ring"] }
130+
tokio-rustls-026 = { package = "tokio-rustls", version = "0.26" }
131131
trust-dns-resolver = "0.23"
132132

133133
[[example]]

actix-tls/tests/accept-openssl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ mod danger {
8888
}
8989

9090
fn supported_verify_schemes(&self) -> Vec<rustls::SignatureScheme> {
91-
rustls::crypto::ring::default_provider()
91+
rustls::crypto::aws_lc_rs::default_provider()
9292
.signature_verification_algorithms
9393
.supported_schemes()
9494
}

0 commit comments

Comments
 (0)