Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustls: ring is no longer maintained, use aws-lc-rs #183

Merged
merged 1 commit into from
Feb 22, 2025
Merged

rustls: ring is no longer maintained, use aws-lc-rs #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@ multipart = { version = "0.18.0", default-features = false, features = [
], optional = true }
native-tls = { version = "0.2.10", optional = true }
rustls-native-certs = { version = "0.8.1", optional = true }
rustls = { version = "0.23.22", default-features = false, features = [
"ring",
"std",
"tls12",
], optional = true }
rustls = { version = "0.23.22", optional = true }
serde = { version = "1.0.143", optional = true }
serde_json = { version = "1.0.83", optional = true }
serde_urlencoded = { version = "0.7.1", optional = true }
Expand All @@ -54,11 +50,7 @@ lazy_static = "1.4.0"
multipart = { version = "0.18.0", default-features = false, features = [
"server",
] }
rustls = { version = "0.23.22", default-features = false, features = [
"ring",
"std",
"tls12",
] }
rustls = "0.23.22"
tokio = { version = "1.20.1", features = ["full"] }
tokio-rustls = "0.26.1"

Expand Down
2 changes: 0 additions & 2 deletions tests/test_proxy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ async fn test_http_url_with_https_proxy() -> Result<(), anyhow::Error> {
#[cfg(any(feature = "tls-native", feature = "__rustls"))]
#[tokio::test(flavor = "multi_thread")]
async fn test_https_url_with_http_proxy() -> Result<(), anyhow::Error> {
rustls::crypto::ring::default_provider().install_default().unwrap();
let remote_port = tools::start_hello_world_server(true).await?;
let remote_url = format!("https://localhost:{remote_port}");

Expand All @@ -77,7 +76,6 @@ async fn test_https_url_with_http_proxy() -> Result<(), anyhow::Error> {
#[cfg(any(feature = "tls-native", feature = "__rustls"))]
#[tokio::test(flavor = "multi_thread")]
async fn test_https_url_with_https_proxy() -> Result<(), anyhow::Error> {
rustls::crypto::ring::default_provider().install_default().unwrap();
let remote_port = tools::start_hello_world_server(true).await?;
let remote_url = format!("https://localhost:{remote_port}");

Expand Down
1 change: 0 additions & 1 deletion tests/tools/proxy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ async fn tunnel(upgraded: Upgraded, addr: String) -> std::io::Result<()> {
}

async fn create_proxy(tls: bool, deny: bool) -> anyhow::Result<u16> {
let _ = rustls::crypto::ring::default_provider().install_default();
let addr = SocketAddr::from(([127, 0, 0, 1], 0));
let listener = TcpListener::bind(addr).await?;
let port = listener.local_addr().unwrap().port();
Expand Down
Loading