diff --git a/Cargo.lock b/Cargo.lock index 528da1d5..197d70cc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -62,7 +62,7 @@ dependencies = [ "cfg-if", "once_cell", "version_check", - "zerocopy", + "zerocopy 0.7.35", ] [[package]] @@ -248,7 +248,7 @@ dependencies = [ "libc", "once_cell", "postage", - "rand", + "rand 0.8.5", "safelog", "serde", "thiserror 2.0.11", @@ -368,9 +368,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.85" +version = "0.1.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" +checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d" dependencies = [ "proc-macro2", "quote", @@ -761,7 +761,7 @@ dependencies = [ "libc", "nix", "parking_lot", - "rand_core", + "rand_core 0.6.4", "ring 0.17.8", "tracing", "untrusted 0.9.0", @@ -1143,7 +1143,7 @@ dependencies = [ "public-suffix", "quinn", "quinn-proto", - "rand", + "rand 0.9.0", "regex", "register-count", "ring-compat", @@ -1428,7 +1428,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", - "rand_core", + "rand_core 0.6.4", "subtle", "zeroize", ] @@ -1440,7 +1440,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core", + "rand_core 0.6.4", "typenum", ] @@ -1729,7 +1729,7 @@ dependencies = [ "dhcproto-macros", "hex", "ipnet", - "rand", + "rand 0.8.5", "thiserror 1.0.69", "trust-dns-proto", "url", @@ -1872,7 +1872,7 @@ dependencies = [ "curve25519-dalek", "ed25519", "merlin", - "rand_core", + "rand_core 0.6.4", "serde", "sha2", "subtle", @@ -1910,7 +1910,7 @@ dependencies = [ "generic-array", "group", "pkcs8", - "rand_core", + "rand_core 0.6.4", "sec1", "subtle", "zeroize", @@ -2053,7 +2053,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ - "rand_core", + "rand_core 0.6.4", "subtle", ] @@ -2324,6 +2324,18 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "getrandom" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.13.3+wasi-0.2.2", + "windows-targets 0.52.6", +] + [[package]] name = "ghash" version = "0.5.1" @@ -2359,7 +2371,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", - "rand_core", + "rand_core 0.6.4", "subtle", ] @@ -2520,7 +2532,7 @@ dependencies = [ "hickory-proto", "once_cell", "radix_trie", - "rand", + "rand 0.8.5", "thiserror 2.0.11", "tokio", "tracing", @@ -2551,7 +2563,7 @@ dependencies = [ "once_cell", "pin-project-lite", "quinn", - "rand", + "rand 0.8.5", "ring 0.17.8", "rustls", "serde", @@ -2578,7 +2590,7 @@ dependencies = [ "once_cell", "parking_lot", "quinn", - "rand", + "rand 0.8.5", "resolv-conf", "rustls", "serde", @@ -2705,9 +2717,9 @@ checksum = "9171a2ea8a68358193d15dd5d70c1c10a2afc3e7e4c5bc92bc9f025cebd7359c" [[package]] name = "httparse" -version = "1.9.5" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" +checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a" [[package]] name = "httpdate" @@ -2733,9 +2745,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.5.2" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" +checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" dependencies = [ "bytes", "futures-channel", @@ -3450,7 +3462,7 @@ checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" dependencies = [ "byteorder", "keccak", - "rand_core", + "rand_core 0.6.4", "zeroize", ] @@ -3678,7 +3690,7 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "rand", + "rand 0.8.5", "smallvec", "zeroize", ] @@ -3849,7 +3861,7 @@ dependencies = [ "glob", "opentelemetry", "percent-encoding", - "rand", + "rand 0.8.5", "serde_json", "thiserror 1.0.69", "tokio", @@ -3920,7 +3932,7 @@ dependencies = [ "ecdsa", "elliptic-curve", "primeorder", - "rand_core", + "rand_core 0.6.4", "sha2", ] @@ -4001,7 +4013,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" dependencies = [ "phf_shared", - "rand", + "rand 0.8.5", ] [[package]] @@ -4169,7 +4181,7 @@ version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" dependencies = [ - "zerocopy", + "zerocopy 0.7.35", ] [[package]] @@ -4396,8 +4408,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" dependencies = [ "bytes", - "getrandom", - "rand", + "getrandom 0.2.15", + "rand 0.8.5", "ring 0.17.8", "rustc-hash 2.1.0", "rustls", @@ -4455,8 +4467,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", - "rand_core", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.0", + "zerocopy 0.8.14", ] [[package]] @@ -4466,7 +4489,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.6.4", +] + +[[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.0", ] [[package]] @@ -4475,7 +4508,17 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.15", +] + +[[package]] +name = "rand_core" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b08f3c9802962f7e1b25113931d94f43ed9725bebc59db9d0c3e9a23b67e15ff" +dependencies = [ + "getrandom 0.3.1", + "zerocopy 0.8.14", ] [[package]] @@ -4522,7 +4565,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ - "getrandom", + "getrandom 0.2.15", "libredox", "thiserror 1.0.69", ] @@ -4626,7 +4669,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", "cfg-if", - "getrandom", + "getrandom 0.2.15", "libc", "spin 0.9.8", "untrusted 0.9.0", @@ -4647,7 +4690,7 @@ dependencies = [ "p256", "p384", "pkcs8", - "rand_core", + "rand_core 0.6.4", "ring 0.17.8", "signature", ] @@ -4665,7 +4708,7 @@ dependencies = [ "num-traits", "pkcs1", "pkcs8", - "rand_core", + "rand_core 0.6.4", "sha2", "signature", "spki", @@ -4944,9 +4987,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.137" +version = "1.0.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "930cfb6e6abf99298aaad7d29abbef7a9999a9a8806a40088f55f0dcec03146b" +checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" dependencies = [ "itoa", "memchr", @@ -5119,7 +5162,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project", - "rand", + "rand 0.8.5", "sendfd", "serde", "serde_json", @@ -5152,7 +5195,7 @@ dependencies = [ "ctr", "hkdf", "md-5", - "rand", + "rand 0.8.5", "ring-compat", "sha1", ] @@ -5199,7 +5242,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest", - "rand_core", + "rand_core 0.6.4", ] [[package]] @@ -5336,7 +5379,7 @@ dependencies = [ "p256", "p384", "p521", - "rand_core", + "rand_core 0.6.4", "rsa", "sec1", "sha2", @@ -5452,13 +5495,13 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.15.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" +checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91" dependencies = [ "cfg-if", "fastrand", - "getrandom", + "getrandom 0.3.1", "once_cell", "rustix", "windows-sys 0.59.0", @@ -5799,8 +5842,8 @@ dependencies = [ "itertools 0.14.0", "libc", "paste", - "rand", - "rand_chacha", + "rand 0.8.5", + "rand_chacha 0.3.1", "serde", "slab", "smallvec", @@ -5817,7 +5860,7 @@ dependencies = [ "derive-deftly", "digest", "educe", - "getrandom", + "getrandom 0.2.15", "safelog", "thiserror 2.0.11", "tor-error", @@ -5839,7 +5882,7 @@ dependencies = [ "derive_more", "educe", "paste", - "rand", + "rand 0.8.5", "smallvec", "thiserror 2.0.11", "tor-basic-utils", @@ -5883,7 +5926,7 @@ dependencies = [ "futures", "oneshot-fused-workaround", "postage", - "rand", + "rand 0.8.5", "safelog", "serde", "thiserror 2.0.11", @@ -5937,7 +5980,7 @@ dependencies = [ "once_cell", "oneshot-fused-workaround", "pin-project", - "rand", + "rand 0.8.5", "retry-error", "safelog", "serde", @@ -6077,7 +6120,7 @@ dependencies = [ "oneshot-fused-workaround", "paste", "postage", - "rand", + "rand 0.8.5", "rusqlite", "safelog", "scopeguard", @@ -6154,7 +6197,7 @@ dependencies = [ "oneshot-fused-workaround", "pin-project", "postage", - "rand", + "rand 0.8.5", "safelog", "serde", "strum", @@ -6190,7 +6233,7 @@ dependencies = [ "itertools 0.14.0", "oneshot-fused-workaround", "postage", - "rand", + "rand 0.8.5", "retry-error", "safelog", "slotmap-careful", @@ -6230,7 +6273,7 @@ dependencies = [ "digest", "itertools 0.14.0", "paste", - "rand", + "rand 0.8.5", "safelog", "signature", "subtle", @@ -6255,7 +6298,7 @@ dependencies = [ "derive_more", "downcast-rs", "paste", - "rand", + "rand 0.8.5", "signature", "ssh-key", "thiserror 2.0.11", @@ -6283,7 +6326,7 @@ dependencies = [ "humantime", "inventory", "itertools 0.14.0", - "rand", + "rand 0.8.5", "serde", "signature", "ssh-key", @@ -6344,9 +6387,9 @@ dependencies = [ "digest", "ed25519-dalek", "educe", - "getrandom", + "getrandom 0.2.15", "hex", - "rand_core", + "rand_core 0.6.4", "rsa", "safelog", "serde", @@ -6421,7 +6464,7 @@ dependencies = [ "humantime", "itertools 0.14.0", "num_enum", - "rand", + "rand 0.8.5", "serde", "static_assertions", "strum", @@ -6458,7 +6501,7 @@ dependencies = [ "itertools 0.14.0", "once_cell", "phf", - "rand", + "rand 0.8.5", "serde", "serde_with", "signature", @@ -6531,8 +6574,8 @@ dependencies = [ "hmac", "oneshot-fused-workaround", "pin-project", - "rand", - "rand_core", + "rand 0.8.5", + "rand_core 0.6.4", "safelog", "slotmap-careful", "subtle", @@ -6578,7 +6621,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2bc9f6f400d52990361bbbda30576895af10efa723c1e25b07b2468e5c5edad" dependencies = [ - "rand", + "rand 0.8.5", "serde", "tor-basic-utils", "tor-linkspec", @@ -6682,7 +6725,7 @@ dependencies = [ "indexmap 1.9.3", "pin-project", "pin-project-lite", - "rand", + "rand 0.8.5", "slab", "tokio", "tokio-util", @@ -6915,7 +6958,7 @@ dependencies = [ "idna 0.2.3", "ipnet", "lazy_static", - "rand", + "rand 0.8.5", "smallvec", "thiserror 1.0.69", "tinyvec", @@ -6931,8 +6974,8 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tuic" -version = "1.4.3" -source = "git+https://github.com/Itsusinn/tuic.git?tag=v1.4.3#2a962370a50ca9265b22aee0d299cf4ad573d310" +version = "1.4.5" +source = "git+https://github.com/Itsusinn/tuic.git?tag=v1.4.5#17ee3f702e26aca048495d4c66ad5316bb8eaf98" dependencies = [ "bytes", "futures-util", @@ -6944,8 +6987,8 @@ dependencies = [ [[package]] name = "tuic-quinn" -version = "1.4.3" -source = "git+https://github.com/Itsusinn/tuic.git?tag=v1.4.3#2a962370a50ca9265b22aee0d299cf4ad573d310" +version = "1.4.5" +source = "git+https://github.com/Itsusinn/tuic.git?tag=v1.4.5#17ee3f702e26aca048495d4c66ad5316bb8eaf98" dependencies = [ "bytes", "eyre", @@ -6986,7 +7029,7 @@ dependencies = [ "http", "httparse", "log", - "rand", + "rand 0.8.5", "sha1", "thiserror 2.0.11", "utf-8", @@ -7144,8 +7187,8 @@ version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3758f5e68192bb96cc8f9b7e2c2cfdabb435499a28499a42f8f984092adad4b" dependencies = [ - "getrandom", - "rand", + "getrandom 0.2.15", + "rand 0.8.5", "serde", "uuid-macro-internal", ] @@ -7227,6 +7270,15 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasi" +version = "0.13.3+wasi-0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +dependencies = [ + "wit-bindgen-rt", +] + [[package]] name = "wasix" version = "0.12.21" @@ -7343,9 +7395,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.7" +version = "0.26.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" +checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9" dependencies = [ "rustls-pki-types", ] @@ -7798,6 +7850,15 @@ dependencies = [ "windows 0.51.1", ] +[[package]] +name = "wit-bindgen-rt" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +dependencies = [ + "bitflags 2.8.0", +] + [[package]] name = "write16" version = "1.0.0" @@ -7826,7 +7887,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek", - "rand_core", + "rand_core 0.6.4", "serde", "zeroize", ] @@ -7872,7 +7933,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "byteorder", - "zerocopy-derive", + "zerocopy-derive 0.7.35", +] + +[[package]] +name = "zerocopy" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a367f292d93d4eab890745e75a778da40909cab4d6ff8173693812f79c4a2468" +dependencies = [ + "zerocopy-derive 0.8.14", ] [[package]] @@ -7886,6 +7956,17 @@ dependencies = [ "syn 2.0.96", ] +[[package]] +name = "zerocopy-derive" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3931cb58c62c13adec22e38686b559c86a30565e16ad6e8510a337cedc611e1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "zerofrom" version = "0.1.5" diff --git a/clash_lib/Cargo.toml b/clash_lib/Cargo.toml index 6c9f8612..24d83ed6 100644 --- a/clash_lib/Cargo.toml +++ b/clash_lib/Cargo.toml @@ -105,7 +105,7 @@ hickory-proto = { version = "0.25.0-alpha.2", features = ["dns-over-rustls", "dn dhcproto = "0.12" ring-compat = { version = "0.8", features = ["aead"] } -rand = "0.8" +rand = "0.9" tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } tracing-appender = "0.2" @@ -119,8 +119,8 @@ arti-client = { version = "0.26", optional = true, default-features = false, fea tor-rtcompat = { version = "0.26", optional = true, default-features = false } # tuic -tuic = { tag = "v1.4.3", optional = true, git = "https://github.com/Itsusinn/tuic.git" } -tuic-quinn = { tag = "v1.4.3", optional = true, git = "https://github.com/Itsusinn/tuic.git" } +tuic = { tag = "v1.4.5", optional = true, git = "https://github.com/Itsusinn/tuic.git" } +tuic-quinn = { tag = "v1.4.5", optional = true, git = "https://github.com/Itsusinn/tuic.git" } register-count = { version = "0.1", optional = true } quinn = { version = "0.11", default-features = false, features = ["futures-io", "runtime-tokio", "rustls"] } @@ -138,7 +138,7 @@ criterion = { version = "0.5", features = ["html_reports", "async_tokio"], optio memory-stats = "1.0.0" [dev-dependencies] -tempfile = "3.15" +tempfile = "3.16" mockall = "0.13.1" tokio-test = "0.4.4" axum-macros = "0.5.0"