From d6339933d54974952721659c3de2b2871a086c1a Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Sat, 8 Apr 2023 02:55:02 +0200 Subject: Implement basic websocket support --- Cargo.toml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 778e9d4..f2925f0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,6 +27,8 @@ clap_complete = "4.1.5" daemonize = "0.5.0" directories = "5.0.0" env_logger = "0.10.0" +futures = "0.3.28" +futures-channel = "0.3.28" futures-util = "0.3.27" hkdf = "0.12.3" hmac = { version = "0.12.1", features = ["std"] } @@ -57,6 +59,8 @@ totp-lite = "2.0.0" url = "2.3.1" uuid = { version = "1.3.0", features = ["v4"] } zeroize = "1.5.7" +rmpv = "1.0.0" +tokio-tungstenite = { version = "*", features = ["native-tls"] } [package.metadata.deb] depends = "pinentry" -- cgit v1.2.3-54-g00ecf From 7729f1c13c3c19423bdc3e92f1e8cc7057667fe8 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Thu, 27 Apr 2023 02:07:59 +0200 Subject: Fix tokio-tungstenite dependency --- Cargo.lock | 102 ++++--------------------------------------------------------- Cargo.toml | 2 +- 2 files changed, 7 insertions(+), 97 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.lock b/Cargo.lock index c484789..8acee10 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -376,21 +376,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" version = "1.1.0" @@ -825,24 +810,6 @@ dependencies = [ "windows-sys 0.45.0", ] -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "nix" version = "0.26.2" @@ -921,50 +888,12 @@ version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" -[[package]] -name = "openssl" -version = "0.10.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d2f106ab837a24e03672c59b1239669a0596406ff657c3c0835b6b7f0f35a33" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.10", -] - [[package]] name = "openssl-probe" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-sys" -version = "0.9.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a20eace9dc2d82904039cb76dcf50fb1a0bba071cfd1629720b5d6f1ddba0fa" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "os_str_bytes" version = "6.5.0" @@ -1070,12 +999,6 @@ dependencies = [ "spki", ] -[[package]] -name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - [[package]] name = "ppv-lite86" version = "0.2.17" @@ -1740,16 +1663,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.23.4" @@ -1780,10 +1693,12 @@ checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" dependencies = [ "futures-util", "log", - "native-tls", + "rustls", + "rustls-native-certs", "tokio", - "tokio-native-tls", + "tokio-rustls", "tungstenite", + "webpki", ] [[package]] @@ -1856,12 +1771,13 @@ dependencies = [ "http", "httparse", "log", - "native-tls", "rand", + "rustls", "sha1", "thiserror", "url", "utf-8", + "webpki", ] [[package]] @@ -1939,12 +1855,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "version_check" version = "0.9.4" diff --git a/Cargo.toml b/Cargo.toml index f2925f0..ef700e2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,7 +60,7 @@ url = "2.3.1" uuid = { version = "1.3.0", features = ["v4"] } zeroize = "1.5.7" rmpv = "1.0.0" -tokio-tungstenite = { version = "*", features = ["native-tls"] } +tokio-tungstenite = { version = "0.18.0", features = ["rustls-tls-native-roots"] } [package.metadata.deb] depends = "pinentry" -- cgit v1.2.3-54-g00ecf