From 631241baa8319bbd3843e028e9fde0afd5a2e335 Mon Sep 17 00:00:00 2001 From: Daniel McCarney Date: Thu, 11 May 2023 11:17:21 -0400 Subject: [PATCH 1/2] deps: remove webpki dependency. This commit updates the existing Quinn sub-crate dependencies to remove the explicit `webpki` v0.22 dependency. It's not used by directly anywhere and can be a transitive dependency through rustls as required. --- perf/Cargo.toml | 1 - quinn-proto/Cargo.toml | 3 +-- quinn/Cargo.toml | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/perf/Cargo.toml b/perf/Cargo.toml index 76e626fcf..a668503f1 100644 --- a/perf/Cargo.toml +++ b/perf/Cargo.toml @@ -22,7 +22,6 @@ rustls-pemfile = "1.0.0" serde = { version = "1.0", features = ["derive"], optional = true } serde_json = { version = "1.0", optional = true } socket2 = "0.5" -webpki = "0.22" clap = { version = "4", features = ["derive"] } tokio = { version = "1.0.1", features = ["rt", "macros", "signal", "net", "sync"] } tracing = "0.1.10" diff --git a/quinn-proto/Cargo.toml b/quinn-proto/Cargo.toml index e27b13f98..7ce15052d 100644 --- a/quinn-proto/Cargo.toml +++ b/quinn-proto/Cargo.toml @@ -18,7 +18,7 @@ maintenance = { status = "experimental" } [features] default = ["tls-rustls", "log"] -tls-rustls = ["rustls", "webpki", "ring"] +tls-rustls = ["rustls", "ring"] # Provides `ClientConfig::with_native_roots()` convenience method native-certs = ["rustls-native-certs"] # Write logs via the `log` crate when no `tracing` subscriber exists @@ -36,7 +36,6 @@ slab = "0.4" thiserror = "1.0.21" tinyvec = { version = "1.1", features = ["alloc"] } tracing = "0.1.10" -webpki = { version = "0.22", default-features = false, optional = true } [dev-dependencies] assert_matches = "1.1" diff --git a/quinn/Cargo.toml b/quinn/Cargo.toml index ec90e5e08..d697cc6a1 100644 --- a/quinn/Cargo.toml +++ b/quinn/Cargo.toml @@ -20,7 +20,7 @@ default = ["native-certs", "tls-rustls", "runtime-tokio", "log"] lock_tracking = [] # Provides `ClientConfig::with_native_roots()` convenience method native-certs = ["proto/native-certs"] -tls-rustls = ["rustls", "webpki", "proto/tls-rustls", "ring"] +tls-rustls = ["rustls", "proto/tls-rustls", "ring"] # Enables `Endpoint::client` and `Endpoint::server` conveniences ring = ["proto/ring"] runtime-tokio = ["tokio/time", "tokio/rt", "tokio/net"] @@ -46,7 +46,6 @@ thiserror = "1.0.21" tracing = "0.1.10" tokio = { version = "1.28.1", features = ["sync"] } udp = { package = "quinn-udp", path = "../quinn-udp", version = "0.4", default-features = false } -webpki = { version = "0.22", default-features = false, optional = true } [dev-dependencies] anyhow = "1.0.22" From b6a90d7360b5e7d4cbd4bbdafa6e8edf11c918eb Mon Sep 17 00:00:00 2001 From: Daniel McCarney Date: Thu, 11 May 2023 16:00:47 -0400 Subject: [PATCH 2/2] bump quinn, quinn-proto crate versions. --- quinn-proto/Cargo.toml | 2 +- quinn/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/quinn-proto/Cargo.toml b/quinn-proto/Cargo.toml index 7ce15052d..9c7a38119 100644 --- a/quinn-proto/Cargo.toml +++ b/quinn-proto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quinn-proto" -version = "0.10.0" +version = "0.10.1" edition = "2021" rust-version = "1.63" license = "MIT OR Apache-2.0" diff --git a/quinn/Cargo.toml b/quinn/Cargo.toml index d697cc6a1..8a8df6fd6 100644 --- a/quinn/Cargo.toml +++ b/quinn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quinn" -version = "0.10.0" +version = "0.10.1" license = "MIT OR Apache-2.0" repository = "https://github.com/quinn-rs/quinn" description = "Versatile QUIC transport protocol implementation"