From 05957c366f7ed00edc40a0b7283ebe019ba26076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= Date: Thu, 18 Jan 2024 10:19:18 +0100 Subject: [PATCH] Switch reqwest to rustls --- Cargo.lock | 17 +---------------- Cargo.toml | 2 +- ephemera/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e4fc250373..24fc0458c0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3981,19 +3981,6 @@ dependencies = [ "tokio-io-timeout", ] -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - [[package]] name = "iana-time-zone" version = "0.1.58" @@ -9191,12 +9178,10 @@ dependencies = [ "http-body", "hyper", "hyper-rustls", - "hyper-tls", "ipnet", "js-sys", "log", "mime", - "native-tls", "once_cell", "percent-encoding", "pin-project-lite 0.2.13", @@ -9208,7 +9193,6 @@ dependencies = [ "serde_urlencoded", "system-configuration", "tokio", - "tokio-native-tls", "tokio-rustls 0.24.1", "tokio-socks", "tokio-util", @@ -9218,6 +9202,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", + "webpki-roots 0.25.2", "winreg", ] diff --git a/Cargo.toml b/Cargo.toml index bedb046d5b..3a328ad5f1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -158,7 +158,7 @@ log = "0.4" once_cell = "1.7.2" parking_lot = "0.12.1" rand = "0.8.5" -reqwest = "0.11.22" +reqwest = { version = "0.11.22", default_features = false, features = ["rustls-tls"] } schemars = "0.8.1" serde = "1.0.152" serde_json = "1.0.91" diff --git a/ephemera/Cargo.toml b/ephemera/Cargo.toml index 6221421aab..f8e963f5b7 100644 --- a/ephemera/Cargo.toml +++ b/ephemera/Cargo.toml @@ -37,7 +37,7 @@ nym-config = { path = "../common/config" } nym-ephemera-common = { path = "../common/cosmwasm-smart-contracts/ephemera" } pretty_env_logger = "0.4" refinery = { version = "0.8.7", features = ["rusqlite"], optional = true } -reqwest = { version = "0.11.22", features = ["json"] } +reqwest = { version = "0.11.22", default_features = false, features = ["rustls-tls", "json"] } # Rocksdb kills compilation times and we're not currently using it. The reason # we comment it out is that rust-analyzer runs with --all-features #rocksdb = { version = "0.21.0", optional = true }