diff --git a/Cargo.lock b/Cargo.lock index 0c861961..1ea5069e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -501,15 +501,14 @@ checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-tls" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfeefd0ca297cbbb3bd34fd6b228401c2a5177038257afd751bc29f0a2da4795" +checksum = "b2ae3c9eba89d472a0e4fe1dea433df78fbbe63d2b764addaf2ba3a6bde89a5e" dependencies = [ "futures-core", "futures-io", - "rustls 0.20.9", + "rustls", "rustls-pemfile", - "webpki", "webpki-roots", ] @@ -526,9 +525,9 @@ dependencies = [ [[package]] name = "async-tungstenite" -version = "0.23.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e9efbe14612da0a19fb983059a0b621e9cf6225d7018ecab4f9988215540dc" +checksum = "ef0f8d64ef9351752fbe5462f242c625d9c4910d2bc3f7ec44c43857ca123f5d" dependencies = [ "async-std", "async-tls", @@ -536,7 +535,7 @@ dependencies = [ "futures-util", "log", "pin-project-lite", - "tungstenite", + "tungstenite 0.21.0", ] [[package]] @@ -574,7 +573,7 @@ dependencies = [ "bitflags 1.3.2", "bytes", "futures-util", - "http", + "http 0.2.12", "http-body", "hyper", "itoa", @@ -591,7 +590,7 @@ dependencies = [ "sha1", "sync_wrapper", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.20.1", "tower", "tower-layer", "tower-service", @@ -606,7 +605,7 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", + "http 0.2.12", "http-body", "mime", "rustversion", @@ -2766,6 +2765,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.6" @@ -2773,7 +2783,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.12", "pin-project-lite", ] @@ -2805,7 +2815,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "http", + "http 0.2.12", "http-body", "httparse", "httpdate", @@ -3110,7 +3120,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-tungstenite", + "tokio-tungstenite 0.21.0", "tower-http", "tracing", "tracing-subscriber", @@ -3131,7 +3141,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-tungstenite", + "tokio-tungstenite 0.21.0", "tower-http", "tracing", "tracing-subscriber", @@ -4159,18 +4169,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rustls" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" -dependencies = [ - "log", - "ring 0.16.20", - "sct", - "webpki", -] - [[package]] name = "rustls" version = "0.21.10" @@ -4786,7 +4784,19 @@ dependencies = [ "futures-util", "log", "tokio", - "tungstenite", + "tungstenite 0.20.1", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.21.0", ] [[package]] @@ -4845,7 +4855,7 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http", + "http 0.2.12", "http-body", "http-range-header", "pin-project-lite", @@ -4971,7 +4981,26 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.12", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", "httparse", "log", "rand", @@ -5302,7 +5331,7 @@ dependencies = [ "ring 0.17.8", "rtcp", "rtp", - "rustls 0.21.10", + "rustls", "sdp", "serde", "serde_json", @@ -5362,7 +5391,7 @@ dependencies = [ "rand_core", "rcgen", "ring 0.17.8", - "rustls 0.21.10", + "rustls", "sec1", "serde", "sha1", diff --git a/matchbox_server/Cargo.toml b/matchbox_server/Cargo.toml index d8e1fd8a..57e099df 100644 --- a/matchbox_server/Cargo.toml +++ b/matchbox_server/Cargo.toml @@ -36,4 +36,4 @@ thiserror = "1.0" tokio-stream = "0.1" [dev-dependencies] -tokio-tungstenite = "0.20.0" +tokio-tungstenite = "0.21.0" diff --git a/matchbox_signaling/Cargo.toml b/matchbox_signaling/Cargo.toml index 6877d9ad..6c49c2aa 100644 --- a/matchbox_signaling/Cargo.toml +++ b/matchbox_signaling/Cargo.toml @@ -35,5 +35,5 @@ tokio-stream = "0.1" async-trait = "0.1" [dev-dependencies] -tokio-tungstenite = "0.20.0" +tokio-tungstenite = "0.21.0" tracing-subscriber = { version = "0.3", features = ["env-filter"] } diff --git a/matchbox_socket/Cargo.toml b/matchbox_socket/Cargo.toml index fa7c96db..ab5ddc59 100644 --- a/matchbox_socket/Cargo.toml +++ b/matchbox_socket/Cargo.toml @@ -76,7 +76,7 @@ web-sys = { version = "0.3.22", default-features = false, features = [ serde-wasm-bindgen = "0.6" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -async-tungstenite = { version = "0.23", default-features = false, features = [ +async-tungstenite = { version = "0.25", default-features = false, features = [ "async-std-runtime", "async-tls", ] }