From a125aa5c7730711101c495d3f56f7e478f41aadf Mon Sep 17 00:00:00 2001 From: tidely <43219534+tidely@users.noreply.github.com> Date: Tue, 25 Aug 2026 07:35:26 +0300 Subject: [PATCH] bump xwt and related deps --- Cargo.lock | 279 +++++------------- Cargo.toml | 14 +- .../aeronet_webtransport/src/cert/native.rs | 4 +- 3 files changed, 83 insertions(+), 214 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 84c39d2a..9804a693 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -262,7 +262,7 @@ dependencies = [ "document-features", "futures", "js-sys", - "rcgen 0.13.2", + "rcgen", "rustls", "rustls-native-certs", "tokio", @@ -294,7 +294,7 @@ dependencies = [ "document-features", "futures", "js-sys", - "spki 0.7.3", + "spki", "tracing", "wasm-bindgen", "wtransport", @@ -1617,7 +1617,7 @@ dependencies = [ "glam", "itertools", "libm", - "rand 0.10.2", + "rand", "rand_distr", "serde", "thiserror 2.0.20", @@ -2363,15 +2363,6 @@ dependencies = [ "cpufeatures 0.3.0", ] -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array 0.14.7", -] - [[package]] name = "block-buffer" version = "0.12.1" @@ -2548,7 +2539,7 @@ checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81" dependencies = [ "cfg-if", "cpufeatures 0.3.0", - "rand_core 0.10.1", + "rand_core", ] [[package]] @@ -2719,12 +2710,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32b13ea120a812beba79e34316b3942a857c86ec1593cb34f27bb28272ce2cca" -[[package]] -name = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - [[package]] name = "const-oid" version = "0.10.2" @@ -2972,7 +2957,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453" dependencies = [ "hybrid-array", - "rand_core 0.10.1", + "rand_core", ] [[package]] @@ -3019,9 +3004,9 @@ dependencies = [ "cfg-if", "cpufeatures 0.3.0", "curve25519-dalek-derive", - "digest 0.11.3", + "digest", "fiat-crypto", - "rand_core 0.10.1", + "rand_core", "rustc_version", "serde", "subtle", @@ -3071,27 +3056,16 @@ dependencies = [ "syn 3.0.3", ] -[[package]] -name = "der" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" -dependencies = [ - "const-oid 0.9.6", - "der_derive", - "flagset", - "pem-rfc7468 0.7.0", - "zeroize", -] - [[package]] name = "der" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a69dedd701da44b0536442edf09c81a64b0ab97a7a4a5e3d1971f00027cbc63d" dependencies = [ - "const-oid 0.10.2", - "pem-rfc7468 1.0.0", + "const-oid", + "der_derive", + "flagset", + "pem-rfc7468", "zeroize", ] @@ -3111,9 +3085,9 @@ dependencies = [ [[package]] name = "der_derive" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18" +checksum = "59600e2c2d636fde9b65e99cc6445ac770c63d3628195ff39932b8d6d7409903" dependencies = [ "proc-macro2", "quote", @@ -3172,24 +3146,14 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab03c107fafeb3ee9f5925686dbb7a73bc76e3932abb0d2b365cb64b169cf04c" -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer 0.10.4", - "crypto-common 0.1.7", -] - [[package]] name = "digest" version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" dependencies = [ - "block-buffer 0.12.1", - "const-oid 0.10.2", + "block-buffer", + "const-oid", "crypto-common 0.2.2", ] @@ -3310,9 +3274,9 @@ checksum = "6ebaa1a2bf1290ab3bfe5a7b771d050ebffab2711c19a81691c683a5144a25de" dependencies = [ "curve25519-dalek", "ed25519", - "rand_core 0.10.1", + "rand_core", "serde", - "sha2 0.11.0", + "sha2", "signature", "subtle", "zeroize", @@ -3884,7 +3848,7 @@ dependencies = [ "js-sys", "libc", "r-efi 6.0.0", - "rand_core 0.10.1", + "rand_core", "wasm-bindgen", ] @@ -3952,7 +3916,7 @@ dependencies = [ "bytemuck", "encase", "libm", - "rand 0.10.2", + "rand", "serde_core", ] @@ -4221,7 +4185,7 @@ dependencies = [ "idna", "ipnet", "jni 0.22.4", - "rand 0.10.2", + "rand", "rustls", "thiserror 2.0.20", "tinyvec", @@ -4243,7 +4207,7 @@ dependencies = [ "jni 0.22.4", "once_cell", "prefix-trie", - "rand 0.10.2", + "rand", "ring", "thiserror 2.0.20", "tinyvec", @@ -4268,7 +4232,7 @@ dependencies = [ "ndk-context", "once_cell", "parking_lot", - "rand 0.10.2", + "rand", "resolv-conf", "rustls", "smallvec", @@ -4591,7 +4555,7 @@ dependencies = [ "hyper", "hyper-util", "log", - "rand 0.10.2", + "rand", "tokio", "url", "xmltree", @@ -4723,7 +4687,7 @@ dependencies = [ "pin-project", "portable-atomic", "portmapper", - "rand 0.10.2", + "rand", "reqwest", "rustc-hash 2.1.3", "rustls", @@ -4753,7 +4717,7 @@ dependencies = [ "ed25519-dalek", "getrandom 0.4.3", "n0-error", - "rand 0.10.2", + "rand", "serde", "url", "zeroize", @@ -4774,7 +4738,7 @@ dependencies = [ "n0-future", "ndk-context", "portable-atomic", - "rand 0.10.2", + "rand", "rustls", "simple-dns", "strum", @@ -4838,7 +4802,7 @@ dependencies = [ "num_enum", "pin-project", "postcard", - "rand 0.10.2", + "rand", "reqwest", "rustls", "rustls-pki-types", @@ -5560,7 +5524,7 @@ dependencies = [ "getrandom 0.4.3", "identity-hash", "lru-slab", - "rand 0.10.2", + "rand", "rand_pcg", "ring", "rustc-hash 2.1.3", @@ -6320,9 +6284,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pastey" -version = "0.1.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35fb2e5f958ec131621fdd531e9fc186ed768cbe395337403ae56c17a74c68ec" +checksum = "2ee67f1008b1ba2321834326597b8e186293b049a023cdef258527550b9935b4" [[package]] name = "pem" @@ -6334,15 +6298,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - [[package]] name = "pem-rfc7468" version = "1.0.0" @@ -6437,8 +6392,8 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "451913da69c775a56034ea8d9003d27ee8948e12443eae7c038ba100a4f21cb7" dependencies = [ - "der 0.8.1", - "spki 0.8.0", + "der", + "spki", ] [[package]] @@ -6549,7 +6504,7 @@ dependencies = [ "n0-future", "netwatch", "num_enum", - "rand 0.10.2", + "rand", "serde", "smallvec", "socket2", @@ -6611,15 +6566,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "ppv-lite86" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" -dependencies = [ - "zerocopy", -] - [[package]] name = "prefix-trie" version = "0.8.4" @@ -6711,7 +6657,7 @@ dependencies = [ "bytes", "getrandom 0.4.3", "lru-slab", - "rand 0.10.2", + "rand", "rand_pcg", "ring", "rustc-hash 2.1.3", @@ -6765,16 +6711,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "019b4b213425016d7d84a153c4c73afb0946fbb4840e4eece7ba8848b9d6da22" -[[package]] -name = "rand" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41" -dependencies = [ - "rand_chacha", - "rand_core 0.9.5", -] - [[package]] name = "rand" version = "0.10.2" @@ -6783,26 +6719,7 @@ checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80" dependencies = [ "chacha20", "getrandom 0.4.3", - "rand_core 0.10.1", -] - -[[package]] -name = "rand_chacha" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" -dependencies = [ - "ppv-lite86", - "rand_core 0.9.5", -] - -[[package]] -name = "rand_core" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" -dependencies = [ - "getrandom 0.3.4", + "rand_core", ] [[package]] @@ -6818,7 +6735,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d431c2703ccf129de4d45253c03f49ebb22b97d6ad79ee3ecfc7e3f4862c1d8" dependencies = [ "num-traits", - "rand 0.10.2", + "rand", ] [[package]] @@ -6827,7 +6744,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a" dependencies = [ - "rand_core 0.10.1", + "rand_core", ] [[package]] @@ -6856,28 +6773,16 @@ dependencies = [ [[package]] name = "rcgen" -version = "0.13.2" +version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2" +checksum = "091e7a8e7d86e6feb87a27ce8e2cba29d49eff9507afeebefab7eeb2ca667fb4" dependencies = [ "pem", - "ring", - "rustls-pki-types", - "time", - "yasna 0.5.2", -] - -[[package]] -name = "rcgen" -version = "0.14.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57f6d249aad744e274e682777a50283a225a32705394ee6d5fcc01efa25e4055" -dependencies = [ "ring", "rustls-pki-types", "time", "x509-parser", - "yasna 0.6.0", + "yasna", ] [[package]] @@ -7388,13 +7293,13 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.7" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a978451301f4db1d02937a4ab3ccce137717b81826e79b7d49ffe3244a13c3b8" +checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214" dependencies = [ "cfg-if", - "cpufeatures 0.2.17", - "digest 0.10.7", + "cpufeatures 0.3.0", + "digest", ] [[package]] @@ -7403,17 +7308,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" -[[package]] -name = "sha2" -version = "0.10.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" -dependencies = [ - "cfg-if", - "cpufeatures 0.2.17", - "digest 0.10.7", -] - [[package]] name = "sha2" version = "0.11.0" @@ -7422,7 +7316,7 @@ checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" dependencies = [ "cfg-if", "cpufeatures 0.3.0", - "digest 0.11.3", + "digest", ] [[package]] @@ -7456,7 +7350,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28d567dcbaf0049cb8ac2608a76cd95ff9e4412e1899d389ee400918ca7537f5" dependencies = [ - "rand_core 0.10.1", + "rand_core", ] [[package]] @@ -7683,17 +7577,6 @@ dependencies = [ "bitflags 2.13.1", ] -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der 0.7.10", - "sha2 0.10.9", -] - [[package]] name = "spki" version = "0.8.0" @@ -7701,7 +7584,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d9efca8738c78ee9484207732f728b1ef517bbb1833d6fc0879ca898a522f6f" dependencies = [ "base64ct", - "der 0.8.1", + "der", + "digest", + "sha2", ] [[package]] @@ -8135,9 +8020,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.26.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084" +checksum = "17a073bfed563fa236697a068031408a93cd9522e08abf9933ead3e73411bd71" dependencies = [ "futures-util", "log", @@ -8177,7 +8062,7 @@ dependencies = [ "getrandom 0.4.3", "http", "httparse", - "rand 0.10.2", + "rand", "ring", "rustls-pki-types", "sha1_smol", @@ -8361,21 +8246,20 @@ checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31" [[package]] name = "tungstenite" -version = "0.26.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13" +checksum = "e48ac77174b19c110a50ab2128b24215ac9cb40e0e12e093fb602d175c569d22" dependencies = [ "bytes", "data-encoding", "http", "httparse", "log", - "rand 0.9.5", + "rand", "rustls", "rustls-pki-types", "sha1", "thiserror 2.0.20", - "utf-8", ] [[package]] @@ -8486,12 +8370,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - [[package]] name = "utf8_iter" version = "1.0.4" @@ -8836,9 +8714,9 @@ dependencies = [ [[package]] name = "web-sys-async-io" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39a4ac7301902fe35e1391f230255586f33c1c6e011080d1fe663291ca996880" +checksum = "b66291e1a2cb47dadf8673803d562e3f418cc2af6472377a44530c0a8b106203" dependencies = [ "js-sys", "tokio", @@ -8849,9 +8727,9 @@ dependencies = [ [[package]] name = "web-sys-stream-utils" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90a913a6d558dbf153010d8add2f27bf5964427aa395299b57a7680a5e971cc7" +checksum = "90af4c6d9515017d34626c0a1e5570cf44ca5f99dde4b88a406c033d8d9bba94" dependencies = [ "js-sys", "wasm-bindgen", @@ -8883,9 +8761,9 @@ dependencies = [ [[package]] name = "web-wt-sys" -version = "0.2.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2793e7e95a0f1564bf1e029e4f8ff397b95998fe03fa7f9dd72682f127473c68" +checksum = "77437b8eabcceada3fd9b7443625e5072517b7cb6ae843f70bda4e4cd5db7dbf" dependencies = [ "js-sys", "pastey", @@ -9606,11 +9484,11 @@ dependencies = [ "bytes", "pem", "quinn", - "rcgen 0.14.8", + "rcgen", "rustls", "rustls-native-certs", "rustls-pki-types", - "sha2 0.11.0", + "sha2", "socket2", "thiserror 2.0.20", "time", @@ -9667,13 +9545,13 @@ checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd" [[package]] name = "x509-cert" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1301e935010a701ae5f8655edc0ad17c44bad3ac5ce8c39185f75453b720ae94" +checksum = "105ef4642d9cb137ef83d623d0e4bf08b8adf69e9918ca904a174adb6d3d038b" dependencies = [ - "const-oid 0.9.6", - "der 0.7.10", - "spki 0.7.3", + "const-oid", + "der", + "spki", "tls_codec", ] @@ -9737,15 +9615,15 @@ dependencies = [ [[package]] name = "xwt-core" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f8515b46b1f2da17080b50744b2c14affab6795dd8a29b56708348839576d6" +checksum = "fd464c7ca8f51b8aba9a92aa74c2d0531ba281d855672cb1088dc975712011a5" [[package]] name = "xwt-web" -version = "0.20.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d56c8971ebfae97aa4aef05666638b7b26af0253043b72718c924eb3392a03b" +checksum = "f320bedaa7bcbbda32f8c8b0f86d469f6f0351ccc5c3e8d7e9de6f5b7258b42b" dependencies = [ "js-sys", "thiserror 2.0.20", @@ -9761,9 +9639,9 @@ dependencies = [ [[package]] name = "xwt-wtransport" -version = "0.19.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5b432aa7fbd95cb8482b7644dd6f47e95f91b16970f08fcabcffa4aec1a2fe7" +checksum = "051490dd8f0b7b8dff32c5201f28e99e302c646a2312c6f771fe603393c96800" dependencies = [ "thiserror 2.0.20", "tokio", @@ -9777,15 +9655,6 @@ version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aee1b19627c7c60102ab80d3a9cbe18de90bfe03bfa6c3715447681f0e8c8af6" -[[package]] -name = "yasna" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" -dependencies = [ - "time", -] - [[package]] name = "yasna" version = "0.6.0" diff --git a/Cargo.toml b/Cargo.toml index 1108d07e..15bb8dc8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,29 +50,29 @@ js-sys = { version = "0.3.70" } log = { version = "0.4.26" } octs = { version = "1.0.0", default-features = false } oneshot = { version = "0.1.11" } -rcgen = { version = "0.13.1" } +rcgen = { version = "0.14.9" } ringbuf = { version = "0.4.8", default-features = false } rustls = { version = "0.23.23", default-features = false, features = ["logging", "std", "tls12"] } rustls-native-certs = { version = "0.8.0" } serde = { version = "1.0.219", features = ["derive"] } size_format = { version = "1.0.2" } -spki = { version = "0.7.3" } +spki = { version = "0.8.0" } steamworks = { version = "0.13.1" } sync_wrapper = { version = "1.0.1" } thousands = { version = "0.2.0" } tokio = { version = "1.39.2" } tokio-rustls = { version = "0.26.2", default-features = false } -tokio-tungstenite = { version = "0.26.2", default-features = false } +tokio-tungstenite = { version = "0.30.0", default-features = false } tracing = { version = "0.1.40", default-features = false } typesize = { version = "0.1.14", default-features = false } wasm-bindgen = { version = "0.2.101" } wasm-bindgen-futures = { version = "0.4.51" } web-sys = { version = "0.3.70" } wtransport = { version = "0.7.1" } -x509-cert = { version = "0.2.5" } -xwt-core = { version = "0.9.0" } -xwt-web = { version = "0.20.0" } -xwt-wtransport = { version = "0.19.0" } +x509-cert = { version = "0.3.0" } +xwt-core = { version = "0.10.0" } +xwt-web = { version = "0.22.1" } +xwt-wtransport = { version = "0.20.1" } [workspace.lints.clippy] all = { level = "warn", priority = -1 } diff --git a/crates/aeronet_webtransport/src/cert/native.rs b/crates/aeronet_webtransport/src/cert/native.rs index 854ec473..ee24fca3 100644 --- a/crates/aeronet_webtransport/src/cert/native.rs +++ b/crates/aeronet_webtransport/src/cert/native.rs @@ -23,8 +23,8 @@ pub fn hash_to_b64(hash: impl AsRef) -> String { pub fn spki_fingerprint(cert: &wtransport::tls::Certificate) -> Option { let cert = x509_cert::Certificate::from_der(cert.der()).ok()?; let fingerprint = cert - .tbs_certificate - .subject_public_key_info + .tbs_certificate() + .subject_public_key_info() .fingerprint_bytes() .ok()?; Some(fingerprint)