From b609f77be9865fb2a8dad8990c9b08bd271d2860 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= <joakim.frostegard@gmail.com>
Date: Mon, 10 Apr 2023 00:27:37 +0200
Subject: [PATCH] Update rustls to 0.21, futures-rustls to 0.24

---
 Cargo.lock                        | 31 +++++++++++++++----------------
 aquatic_common/Cargo.toml         |  2 +-
 aquatic_http/Cargo.toml           |  2 +-
 aquatic_http_load_test/Cargo.toml |  4 ++--
 aquatic_ws/Cargo.toml             |  4 ++--
 aquatic_ws_load_test/Cargo.toml   |  4 ++--
 6 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9726107..6996478 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1007,13 +1007,12 @@ dependencies = [
 
 [[package]]
 name = "futures-rustls"
-version = "0.22.2"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd"
+checksum = "35bd3cf68c183738046838e300353e4716c674dc5e56890de4826801a6622a28"
 dependencies = [
  "futures-io",
  "rustls",
- "webpki",
 ]
 
 [[package]]
@@ -2081,14 +2080,14 @@ checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b"
 
 [[package]]
 name = "rustls"
-version = "0.20.8"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"
+checksum = "07180898a28ed6a7f7ba2311594308f595e3dd2e3c3812fa0a80a47b45f17e5d"
 dependencies = [
  "log",
  "ring",
+ "rustls-webpki",
  "sct",
- "webpki",
 ]
 
 [[package]]
@@ -2100,6 +2099,16 @@ dependencies = [
  "base64 0.21.0",
 ]
 
+[[package]]
+name = "rustls-webpki"
+version = "0.100.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.12"
@@ -2772,16 +2781,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "webpki"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
-dependencies = [
- "ring",
- "untrusted",
-]
-
 [[package]]
 name = "winapi"
 version = "0.2.8"
diff --git a/aquatic_common/Cargo.toml b/aquatic_common/Cargo.toml
index 9998c38..4712ec0 100644
--- a/aquatic_common/Cargo.toml
+++ b/aquatic_common/Cargo.toml
@@ -37,5 +37,5 @@ toml = "0.5"
 # Optional
 glommio = { version = "0.8", optional = true }
 hwloc = { version = "0.5", optional = true }
-rustls = { version = "0.20", optional = true }
+rustls = { version = "0.21", optional = true }
 rustls-pemfile = { version = "1", optional = true }
diff --git a/aquatic_http/Cargo.toml b/aquatic_http/Cargo.toml
index daa5abe..8450b86 100644
--- a/aquatic_http/Cargo.toml
+++ b/aquatic_http/Cargo.toml
@@ -31,7 +31,7 @@ cfg-if = "1"
 either = "1"
 futures = "0.3"
 futures-lite = "1"
-futures-rustls = "0.22"
+futures-rustls = "0.24"
 glommio = "0.8"
 itoa = "1"
 libc = "0.2"
diff --git a/aquatic_http_load_test/Cargo.toml b/aquatic_http_load_test/Cargo.toml
index eb16d30..dc6a141 100644
--- a/aquatic_http_load_test/Cargo.toml
+++ b/aquatic_http_load_test/Cargo.toml
@@ -20,14 +20,14 @@ aquatic_toml_config.workspace = true
 
 anyhow = "1"
 futures-lite = "1"
-futures-rustls = "0.22"
+futures-rustls = "0.24"
 hashbrown = "0.13"
 glommio = "0.8"
 log = "0.4"
 mimalloc = { version = "0.1", default-features = false }
 rand = { version = "0.8", features = ["small_rng"] }
 rand_distr = "0.4"
-rustls = { version = "0.20", default-features = false, features = ["logging", "dangerous_configuration"] } # TLS 1.2 disabled
+rustls = { version = "0.21", default-features = false, features = ["logging", "dangerous_configuration"] } # TLS 1.2 disabled
 serde = { version = "1", features = ["derive"] }
 
 [dev-dependencies]
diff --git a/aquatic_ws/Cargo.toml b/aquatic_ws/Cargo.toml
index b13d1f4..39e6e4c 100644
--- a/aquatic_ws/Cargo.toml
+++ b/aquatic_ws/Cargo.toml
@@ -31,7 +31,7 @@ async-tungstenite = "0.19"
 cfg-if = "1"
 futures = "0.3"
 futures-lite = "1"
-futures-rustls = "0.22"
+futures-rustls = "0.24"
 glommio = "0.8"
 hashbrown = { version = "0.13", features = ["serde"] }
 httparse = "1"
@@ -41,7 +41,7 @@ metrics-exporter-prometheus = { version = "0.11", optional = true, default-featu
 mimalloc = { version = "0.1", default-features = false }
 privdrop = "0.5"
 rand = { version = "0.8", features = ["small_rng"] }
-rustls = "0.20"
+rustls = "0.21"
 rustls-pemfile = "1"
 serde = { version = "1", features = ["derive"] }
 signal-hook = { version = "0.3" }
diff --git a/aquatic_ws_load_test/Cargo.toml b/aquatic_ws_load_test/Cargo.toml
index 8da34cd..375893f 100644
--- a/aquatic_ws_load_test/Cargo.toml
+++ b/aquatic_ws_load_test/Cargo.toml
@@ -21,13 +21,13 @@ aquatic_ws_protocol.workspace = true
 anyhow = "1"
 async-tungstenite = "0.19"
 futures = "0.3"
-futures-rustls = "0.22"
+futures-rustls = "0.24"
 glommio = "0.8"
 log = "0.4"
 mimalloc = { version = "0.1", default-features = false }
 rand = { version = "0.8", features = ["small_rng"] }
 rand_distr = "0.4"
-rustls = { version = "0.20", default-features = false, features = ["dangerous_configuration"] }
+rustls = { version = "0.21", default-features = false, features = ["dangerous_configuration"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 tungstenite = "0.18"