Merge branch 'upgrade-to-hyper-1-des-1207'

mullvad · Sep 26, 2024 · 8de2c04 · 8de2c04
2 parents d75f793 + 6864a62
commit 8de2c04
Show file tree

Hide file tree

Showing 5 changed files with 126 additions and 95 deletions.
diff --git a/test/Cargo.lock b/test/Cargo.lock
diff --git a/test/Cargo.toml b/test/Cargo.toml
@@ -60,6 +60,7 @@ tower = "0.4"
 prost = "0.13.3"
 prost-types = "0.13.3"
 tarpc = { version = "0.30", features = ["tokio1", "serde-transport", "serde1"] }
+hyper-util = {version = "0.1.8", features = ["client", "client-legacy", "http2"]}
 
 # Logging
 env_logger = "0.11.0"

diff --git a/test/test-manager/Cargo.toml b/test/test-manager/Cargo.toml
@@ -49,7 +49,7 @@ socks-server = { path = "../socks-server" }
 env_logger = { workspace = true }
 
 tonic = { workspace = true }
-hyper-util = "0.1.8"
+hyper-util = { workspace = true }
 tower = { workspace = true }
 colored = { workspace = true }
 

diff --git a/test/test-rpc/Cargo.toml b/test/test-rpc/Cargo.toml
@@ -23,10 +23,12 @@ log = { workspace = true }
 colored = { workspace = true }
 async-trait = { workspace = true }
 
-hyper = { version = "0.14.23", features = ["client", "http2"] }
-hyper-rustls = { version = "0.24", features = ["log", "webpki-roots"] }
-tokio-rustls = "0.24"
-rustls-pemfile = "0.2"
+hyper = { version = "1.4.1", features = ["client", "http2"] }
+hyper-rustls = { version = "0.27.3", features = ["logging", "webpki-roots", "http1", "ring"], default-features = false}
+hyper-util = {workspace = true}
+http-body-util = "0.1.2"
+tokio-rustls = { version = "0.26.0", features = ["logging", "tls12", "ring"], default-features = false}
+rustls-pemfile = "2.1.3"
 
 [dependencies.tokio-util]
 version = "0.7"