From 2bff66e2c7b3da6512bfadecfbf7532f10c4011e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= Date: Wed, 28 Feb 2024 16:45:00 +0000 Subject: [PATCH] Remove rustls feature on workspace deps (#4422) * Remove rustls feature on workspace deps * Cargo.lock for nym-connect and nym-wallet --- Cargo.lock | 12 ++---------- Cargo.toml | 6 +++--- nym-connect/desktop/Cargo.lock | 11 +---------- nym-wallet/Cargo.lock | 7 ------- 4 files changed, 6 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7dcb192b24..de96670731 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4280,7 +4280,7 @@ dependencies = [ "rw-stream-sink", "soketto", "url", - "webpki-roots 0.22.6", + "webpki-roots", ] [[package]] @@ -8014,7 +8014,6 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.2", "winreg", ] @@ -9177,7 +9176,7 @@ dependencies = [ "time", "tokio-stream", "url", - "webpki-roots 0.22.6", + "webpki-roots", ] [[package]] @@ -9824,7 +9823,6 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", - "rustls 0.21.10", "tokio", "tungstenite", ] @@ -10842,12 +10840,6 @@ dependencies = [ "webpki 0.22.4", ] -[[package]] -name = "webpki-roots" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" - [[package]] name = "webrtc" version = "0.6.0" diff --git a/Cargo.toml b/Cargo.toml index 6e78dea995..e90561c0bb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -159,7 +159,7 @@ log = "0.4" once_cell = "1.7.2" parking_lot = "0.12.1" rand = "0.8.5" -reqwest = { version = "0.11.22", default_features = false, features = ["rustls-tls"] } +reqwest = { version = "0.11.22", default_features = false } schemars = "0.8.1" serde = "1.0.152" serde_json = "1.0.91" @@ -169,9 +169,9 @@ time = "0.3.30" thiserror = "1.0.48" tokio = "1.33.0" tokio-util = "0.7.10" -tokio-tungstenite = { version = "0.20.1", features = ["rustls"] } +tokio-tungstenite = { version = "0.20.1" } tracing = "0.1.37" -tungstenite = { version = "0.20.1", default-features = false, features = ["rustls"] } +tungstenite = { version = "0.20.1", default-features = false } ts-rs = "7.0.0" utoipa = "3.5.0" utoipa-swagger-ui = "3.1.5" diff --git a/nym-connect/desktop/Cargo.lock b/nym-connect/desktop/Cargo.lock index f8ee12014b..cdd144c175 100644 --- a/nym-connect/desktop/Cargo.lock +++ b/nym-connect/desktop/Cargo.lock @@ -5516,7 +5516,6 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.4", "winreg 0.50.0", ] @@ -6483,7 +6482,7 @@ dependencies = [ "thiserror", "tokio-stream", "url", - "webpki-roots 0.22.6", + "webpki-roots", ] [[package]] @@ -7272,7 +7271,6 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", - "rustls 0.21.7", "tokio", "tungstenite", ] @@ -7454,7 +7452,6 @@ dependencies = [ "httparse", "log", "rand 0.8.5", - "rustls 0.21.7", "sha1", "thiserror", "url", @@ -7898,12 +7895,6 @@ dependencies = [ "webpki", ] -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - [[package]] name = "webview2-com" version = "0.19.1" diff --git a/nym-wallet/Cargo.lock b/nym-wallet/Cargo.lock index 0c61b55042..5fc7e020bd 100644 --- a/nym-wallet/Cargo.lock +++ b/nym-wallet/Cargo.lock @@ -4444,7 +4444,6 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", "winreg", ] @@ -6272,12 +6271,6 @@ dependencies = [ "system-deps 6.1.1", ] -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - [[package]] name = "webview2-com" version = "0.19.1"