From 27a413a5e3e9c9abfe765eb96453466570a19b10 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Mon, 3 Feb 2025 13:01:44 -0700 Subject: [PATCH] linux: Remove openssl dependency (#24141) Release Notes: - linux: Move from using openssl for collaboration to rustls/ring --- Cargo.lock | 43 +++++++++++++------------------------------ Cargo.toml | 2 +- 2 files changed, 14 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d2e2ccf5ef..6639192f6c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1021,22 +1021,6 @@ dependencies = [ "syn 2.0.90", ] -[[package]] -name = "async-tungstenite" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cca750b12e02c389c1694d35c16539f88b8bbaa5945934fdc1b41a776688589" -dependencies = [ - "async-native-tls", - "async-std", - "async-tls", - "futures-io", - "futures-util", - "log", - "pin-project-lite", - "tungstenite 0.21.0", -] - [[package]] name = "async-tungstenite" version = "0.28.2" @@ -2607,7 +2591,7 @@ dependencies = [ "anyhow", "async-native-tls", "async-recursion 0.3.2", - "async-tungstenite 0.28.2", + "async-tungstenite", "chrono", "clock", "cocoa 0.26.0", @@ -2750,7 +2734,7 @@ dependencies = [ "assistant_tool", "async-stripe", "async-trait", - "async-tungstenite 0.28.2", + "async-tungstenite", "audio", "aws-config", "aws-sdk-kinesis", @@ -6782,7 +6766,7 @@ checksum = "49c1ba895c5271ff8dcae51c347fd3588905ba0025a57e20955fd231fe1228cc" dependencies = [ "anyhow", "async-trait", - "async-tungstenite 0.28.2", + "async-tungstenite", "futures 0.3.31", "jupyter-protocol", "serde", @@ -7214,7 +7198,7 @@ dependencies = [ [[package]] name = "libwebrtc" version = "0.3.7" -source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=060964da10574cd9bf06463a53bf6e0769c5c45e#060964da10574cd9bf06463a53bf6e0769c5c45e" +source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=811ceae29fabee455f110c56cd66b3f49a7e5003#811ceae29fabee455f110c56cd66b3f49a7e5003" dependencies = [ "cxx", "jni", @@ -7279,7 +7263,7 @@ checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "livekit" version = "0.7.0" -source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=060964da10574cd9bf06463a53bf6e0769c5c45e#060964da10574cd9bf06463a53bf6e0769c5c45e" +source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=811ceae29fabee455f110c56cd66b3f49a7e5003#811ceae29fabee455f110c56cd66b3f49a7e5003" dependencies = [ "chrono", "futures-util", @@ -7301,9 +7285,9 @@ dependencies = [ [[package]] name = "livekit-api" version = "0.4.1" -source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=060964da10574cd9bf06463a53bf6e0769c5c45e#060964da10574cd9bf06463a53bf6e0769c5c45e" +source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=811ceae29fabee455f110c56cd66b3f49a7e5003#811ceae29fabee455f110c56cd66b3f49a7e5003" dependencies = [ - "async-tungstenite 0.25.1", + "async-tungstenite", "futures-util", "http 0.2.12", "jsonwebtoken", @@ -7326,7 +7310,7 @@ dependencies = [ [[package]] name = "livekit-protocol" version = "0.3.6" -source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=060964da10574cd9bf06463a53bf6e0769c5c45e#060964da10574cd9bf06463a53bf6e0769c5c45e" +source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=811ceae29fabee455f110c56cd66b3f49a7e5003#811ceae29fabee455f110c56cd66b3f49a7e5003" dependencies = [ "futures-util", "livekit-runtime", @@ -7343,7 +7327,7 @@ dependencies = [ [[package]] name = "livekit-runtime" version = "0.3.1" -source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=060964da10574cd9bf06463a53bf6e0769c5c45e#060964da10574cd9bf06463a53bf6e0769c5c45e" +source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=811ceae29fabee455f110c56cd66b3f49a7e5003#811ceae29fabee455f110c56cd66b3f49a7e5003" dependencies = [ "async-io", "async-std", @@ -10860,7 +10844,7 @@ dependencies = [ "alacritty_terminal", "anyhow", "async-dispatcher", - "async-tungstenite 0.28.2", + "async-tungstenite", "base64 0.22.1", "client", "collections", @@ -11163,7 +11147,7 @@ name = "rpc" version = "0.1.0" dependencies = [ "anyhow", - "async-tungstenite 0.28.2", + "async-tungstenite", "base64 0.22.1", "chrono", "collections", @@ -14213,7 +14197,6 @@ dependencies = [ "http 1.2.0", "httparse", "log", - "native-tls", "rand 0.8.5", "sha1", "thiserror 1.0.69", @@ -15315,7 +15298,7 @@ dependencies = [ [[package]] name = "webrtc-sys" version = "0.3.5" -source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=060964da10574cd9bf06463a53bf6e0769c5c45e#060964da10574cd9bf06463a53bf6e0769c5c45e" +source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=811ceae29fabee455f110c56cd66b3f49a7e5003#811ceae29fabee455f110c56cd66b3f49a7e5003" dependencies = [ "cc", "cxx", @@ -15328,7 +15311,7 @@ dependencies = [ [[package]] name = "webrtc-sys-build" version = "0.3.5" -source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=060964da10574cd9bf06463a53bf6e0769c5c45e#060964da10574cd9bf06463a53bf6e0769c5c45e" +source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=811ceae29fabee455f110c56cd66b3f49a7e5003#811ceae29fabee455f110c56cd66b3f49a7e5003" dependencies = [ "fs2", "regex", diff --git a/Cargo.toml b/Cargo.toml index 593d128ae8..8fca08a635 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -423,7 +423,7 @@ jupyter-websocket-client = { version = "0.9.0" } libc = "0.2" libsqlite3-sys = { version = "0.30.1", features = ["bundled"] } linkify = "0.10.0" -livekit = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev="060964da10574cd9bf06463a53bf6e0769c5c45e", features = ["dispatcher", "services-dispatcher", "rustls-tls-native-roots"], default-features = false } +livekit = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev="811ceae29fabee455f110c56cd66b3f49a7e5003", features = ["dispatcher", "services-dispatcher", "rustls-tls-native-roots"], default-features = false } log = { version = "0.4.16", features = ["kv_unstable_serde", "serde"] } markup5ever_rcdom = "0.3.0" nanoid = "0.4"