From 58c7ec31062ca1c4bd8d3c73a07f76461cbf6431 Mon Sep 17 00:00:00 2001 From: Fina Wilke Date: Thu, 7 May 2026 03:20:02 +0200 Subject: [PATCH] cargo: Remove 'tls' feature --- CHANGELOG.md | 4 +++ Cargo.lock | 94 ++++---------------------------------------------- Cargo.toml | 1 - cli/Cargo.toml | 1 - 4 files changed, 11 insertions(+), 89 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 962d38ec..b79ef3d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Removed + +- lib: The `async-tls` feature has been removed + ### Added - lib: support for encrypted websocket connections through `futures-rustls` as a future replacement for the `async-tls` dependency diff --git a/Cargo.lock b/Cargo.lock index ad6c068b..680aedbe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -284,19 +284,6 @@ version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" -[[package]] -name = "async-tls" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ae3c9eba89d472a0e4fe1dea433df78fbbe63d2b764addaf2ba3a6bde89a5e" -dependencies = [ - "futures-core", - "futures-io", - "rustls 0.21.12", - "rustls-pemfile", - "webpki-roots 0.22.6", -] - [[package]] name = "async-trait" version = "0.1.89" @@ -316,7 +303,6 @@ checksum = "8447f02eaa65412035e2d3eeaa3fc82bbb8d7137c84c5976b4af685136012ee9" dependencies = [ "async-native-tls", "async-net", - "async-tls", "atomic-waker", "futures-core", "futures-io", @@ -329,7 +315,7 @@ dependencies = [ "rustls-pki-types", "rustls-platform-verifier", "tungstenite", - "webpki-roots 1.0.7", + "webpki-roots", ] [[package]] @@ -381,12 +367,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - [[package]] name = "base64" version = "0.22.1" @@ -1400,7 +1380,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb" dependencies = [ "futures-io", - "rustls 0.23.40", + "rustls", "rustls-pki-types", ] @@ -2035,7 +2015,7 @@ dependencies = [ "async-task", "async-trait", "async-tungstenite", - "base64 0.22.1", + "base64", "bytecodec", "crypto_secretbox", "derive_more", @@ -2890,18 +2870,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "rustls" -version = "0.21.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.7", - "sct", -] - [[package]] name = "rustls" version = "0.23.40" @@ -2910,7 +2878,7 @@ checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" dependencies = [ "once_cell", "rustls-pki-types", - "rustls-webpki 0.103.13", + "rustls-webpki", "subtle", "zeroize", ] @@ -2927,15 +2895,6 @@ dependencies = [ "security-framework", ] -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.7", -] - [[package]] name = "rustls-pki-types" version = "1.14.1" @@ -2956,10 +2915,10 @@ dependencies = [ "jni", "log", "once_cell", - "rustls 0.23.40", + "rustls", "rustls-native-certs", "rustls-platform-verifier-android", - "rustls-webpki 0.103.13", + "rustls-webpki", "security-framework", "security-framework-sys", "webpki-root-certs", @@ -2972,16 +2931,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "rustls-webpki" version = "0.103.13" @@ -3032,16 +2981,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "security-framework" version = "3.7.0" @@ -3696,7 +3635,7 @@ dependencies = [ "log", "native-tls", "rand 0.9.4", - "rustls 0.23.40", + "rustls", "rustls-pki-types", "sha1", "thiserror 2.0.18", @@ -4072,16 +4011,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "webpki-root-certs" version = "1.0.7" @@ -4091,15 +4020,6 @@ dependencies = [ "rustls-pki-types", ] -[[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] - [[package]] name = "webpki-roots" version = "1.0.7" diff --git a/Cargo.toml b/Cargo.toml index 65eb924d..c3a5c70c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -190,7 +190,6 @@ all = ["default", "forwarding", "fuzzy-complete"] # TLS implementations for websocket connections via async-tungstenite # required for optional wss connection to the mailbox server -tls = ["async-tungstenite/async-tls"] futures-rustls-manual-roots = ["async-tungstenite/futures-rustls-manual-roots"] futures-rustls-native-certs = ["async-tungstenite/futures-rustls-native-certs"] futures-rustls-platform-verifier = ["async-tungstenite/futures-rustls-platform-verifier"] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 64be317e..51bd4bb2 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -52,7 +52,6 @@ trycmd = { workspace = true } clipboard = ["dep:arboard"] # TLS implementations for websocket connections via async-tungstenite # required for optional wss connection to the mailbox server -tls = ["magic-wormhole/tls"] futures-rustls-manual-roots = ["magic-wormhole/futures-rustls-manual-roots"] futures-rustls-native-certs = ["magic-wormhole/futures-rustls-native-certs"] futures-rustls-platform-verifier = ["magic-wormhole/futures-rustls-platform-verifier"]