diff --git a/Cargo.lock b/Cargo.lock index 7366606fe15..1861b036ccb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -176,7 +176,6 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time", ] [[package]] @@ -1308,7 +1307,6 @@ dependencies = [ "asn1-rs 0.5.2", "displaydoc", "nom", - "num-bigint", "num-traits", "rusticata-macros", ] @@ -2406,13 +2404,14 @@ dependencies = [ [[package]] name = "interceptor" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5927883184e6a819b22d5e4f5f7bc7ca134fde9b2026fbddd8d95249746ba21e" +checksum = "4705c00485029e738bea8c9505b5ddb1486a8f3627a953e1e77e6abdf5eef90c" dependencies = [ "async-trait", "bytes", "log", + "portable-atomic", "rand 0.8.5", "rtcp", "rtp", @@ -2420,7 +2419,7 @@ dependencies = [ "tokio", "waitgroup", "webrtc-srtp", - "webrtc-util", + "webrtc-util 0.9.0", ] [[package]] @@ -3382,13 +3381,13 @@ dependencies = [ "libp2p-identity", "libp2p-swarm", "libp2p-yamux", - "rcgen", + "rcgen 0.11.3", "ring 0.17.8", "rustls 0.23.8", "rustls-webpki 0.101.7", "thiserror", "tokio", - "x509-parser 0.16.0", + "x509-parser", "yasna", ] @@ -3435,9 +3434,9 @@ dependencies = [ "multihash", "quickcheck", "rand 0.8.5", - "rcgen", + "rcgen 0.11.3", "serde", - "stun", + "stun 0.5.1", "thiserror", "tinytemplate", "tokio", @@ -3503,7 +3502,7 @@ dependencies = [ "libp2p-tcp", "parking_lot", "pin-project-lite", - "rcgen", + "rcgen 0.11.3", "rw-stream-sink", "soketto", "tracing", @@ -4046,15 +4045,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "oid-registry" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" -dependencies = [ - "asn1-rs 0.5.2", -] - [[package]] name = "oid-registry" version = "0.7.0" @@ -4437,6 +4427,12 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -4740,7 +4736,20 @@ dependencies = [ "pem", "ring 0.16.20", "time", - "x509-parser 0.15.1", + "yasna", +] + +[[package]] +name = "rcgen" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54077e1872c46788540de1ea3d7f4ccb1983d12f9aa909b234468676c1a36779" +dependencies = [ + "pem", + "ring 0.17.8", + "rustls-pki-types", + "time", + "x509-parser", "yasna", ] @@ -4992,13 +5001,13 @@ dependencies = [ [[package]] name = "rtcp" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3677908cadfbecb4cc1da9a56a32524fae4ebdfa7c2ea93886e1b1e846488cb9" +checksum = "fc9f775ff89c5fe7f0cc0abafb7c57688ae25ce688f1a52dd88e277616c76ab2" dependencies = [ "bytes", "thiserror", - "webrtc-util", + "webrtc-util 0.9.0", ] [[package]] @@ -5019,15 +5028,16 @@ dependencies = [ [[package]] name = "rtp" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e60482acbe8afb31edf6b1413103b7bca7a65004c423b3c3993749a083994fbe" +checksum = "6870f09b5db96f8b9e7290324673259fd15519ebb7d55acf8e7eb044a9ead6af" dependencies = [ "bytes", + "portable-atomic", "rand 0.8.5", "serde", "thiserror", - "webrtc-util", + "webrtc-util 0.9.0", ] [[package]] @@ -5123,18 +5133,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rustls" -version = "0.21.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" -dependencies = [ - "log", - "ring 0.17.8", - "rustls-webpki 0.101.7", - "sct", -] - [[package]] name = "rustls" version = "0.22.4" @@ -5261,21 +5259,11 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - [[package]] name = "sdp" -version = "0.6.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4653054c30ebce63658762eb0d64e27673868a95564474811ae6c220cf767640" +checksum = "13254db766b17451aced321e7397ebf0a446ef0c8d2942b6e67a95815421093f" dependencies = [ "rand 0.8.5", "substring", @@ -5695,7 +5683,26 @@ dependencies = [ "thiserror", "tokio", "url", - "webrtc-util", + "webrtc-util 0.8.1", +] + +[[package]] +name = "stun" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28fad383a1cc63ae141e84e48eaef44a1063e9d9e55bcb8f51a99b886486e01b" +dependencies = [ + "base64 0.21.7", + "crc", + "lazy_static", + "md-5", + "rand 0.8.5", + "ring 0.17.8", + "subtle", + "thiserror", + "tokio", + "url", + "webrtc-util 0.9.0", ] [[package]] @@ -6264,21 +6271,23 @@ dependencies = [ [[package]] name = "turn" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f4fcb97da0426e8146fe0e9b78cc13120161087256198701d12d9df77f7701" +checksum = "8b000cebd930420ac1ed842c8128e3b3412512dfd5b82657eab035a3f5126acc" dependencies = [ "async-trait", "base64 0.21.7", "futures", "log", "md-5", + "portable-atomic", "rand 0.8.5", - "ring 0.16.20", - "stun", + "ring 0.17.8", + "stun 0.6.0", "thiserror", "tokio", - "webrtc-util", + "tokio-util", + "webrtc-util 0.9.0", ] [[package]] @@ -6624,9 +6633,9 @@ dependencies = [ [[package]] name = "webrtc" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91e7cf018f7185552bf6a5dd839f4ed9827aea33b746763c9a215f84a0d0b34" +checksum = "d8b3a840e31c969844714f93b5a87e73ee49f3bc2a4094ab9132c69497eb31db" dependencies = [ "arc-swap", "async-trait", @@ -6637,19 +6646,20 @@ dependencies = [ "lazy_static", "log", "pem", + "portable-atomic", "rand 0.8.5", - "rcgen", + "rcgen 0.13.1", "regex", - "ring 0.16.20", + "ring 0.17.8", "rtcp", "rtp", - "rustls 0.21.11", + "rustls 0.23.8", "sdp", "serde", "serde_json", "sha2 0.10.8", "smol_str", - "stun", + "stun 0.6.0", "thiserror", "time", "tokio", @@ -6663,28 +6673,29 @@ dependencies = [ "webrtc-media", "webrtc-sctp", "webrtc-srtp", - "webrtc-util", + "webrtc-util 0.9.0", ] [[package]] name = "webrtc-data" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a45d2461d0e0bf93f181e30eb0b40df32b8bf3efb89c53cebb1990e603e2067d" +checksum = "f8b7c550f8d35867b72d511640adf5159729b9692899826fe00ba7fa74f0bf70" dependencies = [ "bytes", "log", + "portable-atomic", "thiserror", "tokio", "webrtc-sctp", - "webrtc-util", + "webrtc-util 0.9.0", ] [[package]] name = "webrtc-dtls" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b140b953f986e97828aa33ec6318186b05d862bee689efbc57af04a243e832" +checksum = "86e5eedbb0375aa04da93fc3a189b49ed3ed9ee844b6997d5aade14fc3e2c26e" dependencies = [ "aes", "aes-gcm", @@ -6700,11 +6711,12 @@ dependencies = [ "p256", "p384", "pem", + "portable-atomic", "rand 0.8.5", "rand_core 0.6.4", - "rcgen", - "ring 0.16.20", - "rustls 0.21.11", + "rcgen 0.13.1", + "ring 0.17.8", + "rustls 0.23.8", "sec1", "serde", "sha1", @@ -6712,25 +6724,26 @@ dependencies = [ "subtle", "thiserror", "tokio", - "webrtc-util", + "webrtc-util 0.9.0", "x25519-dalek", - "x509-parser 0.15.1", + "x509-parser", ] [[package]] name = "webrtc-ice" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66eb4b85646f1c52225779db3e1e7e873dede6db68cc9be080b648f1713083a3" +checksum = "4d4f0ca6d4df8d1bdd34eece61b51b62540840b7a000397bcfb53a7bfcf347c8" dependencies = [ "arc-swap", "async-trait", "crc", "log", + "portable-atomic", "rand 0.8.5", "serde", "serde_json", - "stun", + "stun 0.6.0", "thiserror", "tokio", "turn", @@ -6738,27 +6751,27 @@ dependencies = [ "uuid", "waitgroup", "webrtc-mdns", - "webrtc-util", + "webrtc-util 0.9.0", ] [[package]] name = "webrtc-mdns" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bebbd40e7f8b630a0f1a74783dbfff1edfc0ccaae891c4689891156a8c4d8c" +checksum = "c0804694f3b2acfdff48f6df217979b13cb0a00377c63b5effd111daaee7e8c4" dependencies = [ "log", "socket2 0.5.7", "thiserror", "tokio", - "webrtc-util", + "webrtc-util 0.9.0", ] [[package]] name = "webrtc-media" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfde3c7b9450b67d466bb2f02c6d9ff9514d33535eb9994942afd1f828839d1" +checksum = "1c15b20e98167b22949abc1c20eca7c6d814307d187068fe7a48f0b87a4f6d46" dependencies = [ "byteorder", "bytes", @@ -6769,26 +6782,27 @@ dependencies = [ [[package]] name = "webrtc-sctp" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1af6116b7f9703560c3ad0b32f67220b171bb1b59633b03563db8404d0e482ea" +checksum = "1d850daa68639b9d7bb16400676e97525d1e52b15b4928240ae2ba0e849817a5" dependencies = [ "arc-swap", "async-trait", "bytes", "crc", "log", + "portable-atomic", "rand 0.8.5", "thiserror", "tokio", - "webrtc-util", + "webrtc-util 0.9.0", ] [[package]] name = "webrtc-srtp" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db1f36c1c81e4b1e531c0b9678ba0c93809e196ce62122d87259bb71c03b9f" +checksum = "fbec5da43a62c228d321d93fb12cc9b4d9c03c9b736b0c215be89d8bd0774cfe" dependencies = [ "aead", "aes", @@ -6804,7 +6818,7 @@ dependencies = [ "subtle", "thiserror", "tokio", - "webrtc-util", + "webrtc-util 0.9.0", ] [[package]] @@ -6827,6 +6841,27 @@ dependencies = [ "winapi", ] +[[package]] +name = "webrtc-util" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc8d9bc631768958ed97b8d68b5d301e63054ae90b09083d43e2fefb939fd77e" +dependencies = [ + "async-trait", + "bitflags 1.3.2", + "bytes", + "ipnet", + "lazy_static", + "libc", + "log", + "nix 0.26.4", + "portable-atomic", + "rand 0.8.5", + "thiserror", + "tokio", + "winapi", +] + [[package]] name = "webtransport-tests" version = "0.1.0" @@ -7074,24 +7109,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "x509-parser" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" -dependencies = [ - "asn1-rs 0.5.2", - "data-encoding", - "der-parser 8.2.0", - "lazy_static", - "nom", - "oid-registry 0.6.1", - "ring 0.16.20", - "rusticata-macros", - "thiserror", - "time", -] - [[package]] name = "x509-parser" version = "0.16.0" @@ -7103,7 +7120,8 @@ dependencies = [ "der-parser 9.0.0", "lazy_static", "nom", - "oid-registry 0.7.0", + "oid-registry", + "ring 0.17.8", "rusticata-macros", "thiserror", "time", diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml index 909f78479d9..acc05fa6053 100644 --- a/transports/webrtc/Cargo.toml +++ b/transports/webrtc/Cargo.toml @@ -31,7 +31,7 @@ tinytemplate = "1.2" tokio = { workspace = true, features = ["net"], optional = true } tokio-util = { version = "0.7", features = ["compat"], optional = true } tracing = { workspace = true } -webrtc = { version = "0.9.0", optional = true } +webrtc = { version = "0.11.0", optional = true } [features] tokio = ["dep:tokio", "dep:tokio-util", "dep:webrtc", "if-watch/tokio"]