actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2024-11-27 20:12:58 +01:00
Code Issues Releases Wiki Activity

actix-tls: Disable default features for rustls 0.23 via tokio-rustls 0.26 (#560)

Browse Source 
* 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>
This commit is contained in:
asonix 2024-05-12 16:09:59 -05:00 committed by GitHub
parent 2632c984cc
commit 73451070db
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actix-tls/Cargo.toml Executable file → Normal file
View File

@ -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 webpki-roots-026 = { package = "webpki-roots", version = "0.26", optional = true } # Also used for rustls v0.23
# 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 # native root certificates for rustls impls
rustls-native-certs-06 = { package = "rustls-native-certs", version = "0.6", optional = true } 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" itertools = "0.12"
rcgen = "0.12" rcgen = "0.12"
rustls-pemfile = "2" 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" trust-dns-resolver = "0.23"
[[example]] [[example]]

2
actix-tls/tests/accept-openssl.rs
View File

@ -88,7 +88,7 @@ mod danger {
} }
fn supported_verify_schemes(&self) -> Vec<rustls::SignatureScheme> { fn supported_verify_schemes(&self) -> Vec<rustls::SignatureScheme> {
rustls::crypto::ring::default_provider() rustls::crypto::aws_lc_rs::default_provider()
.signature_verification_algorithms .signature_verification_algorithms
.supported_schemes() .supported_schemes()
} }