diff --git a/Cargo.lock b/Cargo.lock index afcecf36..c5c520fc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,16 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "aead" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" -dependencies = [ - "crypto-common 0.1.7", - "generic-array", -] - [[package]] name = "aead" version = "0.6.1" @@ -19,7 +9,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1973cfbc1a2daf9cf550e74e1f088c28e7f7d8c1e1418fb6c9dc5184b7e84c99" dependencies = [ "crypto-common 0.2.2", - "inout 0.2.5", + "inout", ] [[package]] @@ -28,7 +18,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35f0f96ce78e38c3dc6d8948aa8163d06385be74000f3c7a95bf1eef35d3ea32" dependencies = [ - "cipher 0.5.2", + "cipher", "cpubits", "cpufeatures 0.3.1", ] @@ -39,9 +29,9 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f2b8006a0c83f52b62ba44a97b58bf76fe2f70a329e588f67f89691d93d498f" dependencies = [ - "aead 0.6.1", + "aead", "aes", - "cipher 0.5.2", + "cipher", "ctr", "ctutils", "ghash", @@ -53,9 +43,9 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c32325128cb24de2a2d14d92da7569dae7073f9e47334521d494747fa94d902" dependencies = [ - "aead 0.6.1", + "aead", "aes", - "cipher 0.5.2", + "cipher", "ctr", "ctutils", "polyval", @@ -175,7 +165,7 @@ dependencies = [ "nom", "num-traits", "rusticata-macros", - "thiserror 2.0.21", + "thiserror", "time", ] @@ -224,27 +214,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "async-lock" -version = "3.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311" -dependencies = [ - "event-listener", - "event-listener-strategy", - "pin-project-lite", -] - -[[package]] -name = "async-object-pool" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1ac0219111eb7bb7cb76d4cf2cb50c598e7ae549091d3616f9e95442c18486f" -dependencies = [ - "async-lock", - "event-listener", -] - [[package]] name = "async-recursion" version = "1.2.0" @@ -287,9 +256,9 @@ checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" [[package]] name = "aws-lc-rs" -version = "1.18.2" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faac5829c2b74c28f830747e7818ccfb684261b5f48a1118b1e2a13d36dfab13" +checksum = "048006790404103c488e6c5616b3e7e702a71292aadda08e8f7698a9e0d2eb53" dependencies = [ "aws-lc-sys", "untrusted 0.7.1", @@ -298,9 +267,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.46.0" +version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1622d8446a2d4b2ce0c7eefc73dd43a99779028d5ee5c2dd8073a658ba8a2bc" +checksum = "8bfbe32ac36b3c428696ce315464181bc4029d689fd58e3f2a4e58c252242f52" dependencies = [ "cc", "cmake", @@ -397,15 +366,6 @@ version = "2.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06" -[[package]] -name = "blake2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" -dependencies = [ - "digest 0.10.7", -] - [[package]] name = "blake2" version = "0.11.0" @@ -424,7 +384,7 @@ dependencies = [ "arrayvec", "cc", "cfg-if", - "constant_time_eq", + "constant_time_eq 0.4.2", "cpufeatures 0.3.1", ] @@ -483,7 +443,7 @@ dependencies = [ "serde_derive", "serde_json", "serde_urlencoded", - "thiserror 2.0.21", + "thiserror", "tokio", "tokio-util", "tower-service", @@ -506,16 +466,16 @@ dependencies = [ name = "boring-noise" version = "0.2.1" dependencies = [ - "aead 0.5.2", + "aead", "aws-lc-rs", - "blake2 0.10.6", - "chacha20poly1305 0.10.1", - "constant_time_eq", - "etherparse 0.13.0", - "hmac 0.12.1", + "blake2", + "chacha20poly1305", + "constant_time_eq 0.6.1", + "etherparse 0.21.0", + "hmac", "mock_instant", - "nix 0.30.1", - "parking_lot", + "nix 0.31.3", + "parking_lot 0.13.0", "portable-atomic", "rand_core 0.6.4", "ring", @@ -523,6 +483,16 @@ dependencies = [ "x25519-dalek", ] +[[package]] +name = "bstr" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb31b46c14244e20ee9984b11bf5c992b91fb6939fea616e3512c8baecdbe5f" +dependencies = [ + "memchr", + "serde_core", +] + [[package]] name = "bumpalo" version = "3.20.3" @@ -556,7 +526,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3ed33f9863ee76491bbe0d7e16a225c694d8525287e320dc7fbe71ee212254c" dependencies = [ - "cipher 0.5.2", + "cipher", ] [[package]] @@ -577,8 +547,8 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0be9b34d99d395af800e996c5784f810f8400ccd64202f91859dc677825b5378" dependencies = [ - "aead 0.6.1", - "cipher 0.5.2", + "aead", + "cipher", "ctr", "ctutils", ] @@ -595,17 +565,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527" -[[package]] -name = "chacha20" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" -dependencies = [ - "cfg-if", - "cipher 0.4.4", - "cpufeatures 0.2.17", -] - [[package]] name = "chacha20" version = "0.10.2" @@ -613,34 +572,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06" dependencies = [ "cfg-if", - "cipher 0.5.2", + "cipher", "cpufeatures 0.3.1", "rand_core 0.10.1", ] -[[package]] -name = "chacha20poly1305" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" -dependencies = [ - "aead 0.5.2", - "chacha20 0.9.1", - "cipher 0.4.4", - "poly1305 0.8.0", - "zeroize", -] - [[package]] name = "chacha20poly1305" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b89e1c441e926b9c82a8d023f6e1b7ae0adcfaa7d621814e4d60789bac751cb" dependencies = [ - "aead 0.6.1", - "chacha20 0.10.2", - "cipher 0.5.2", - "poly1305 0.9.1", + "aead", + "chacha20", + "cipher", + "poly1305", ] [[package]] @@ -658,7 +604,7 @@ dependencies = [ "rustls", "rustls-pemfile", "serde", - "thiserror 2.0.21", + "thiserror", "tokio", "tracing", "webpki-roots", @@ -678,17 +624,6 @@ dependencies = [ "windows-link 0.2.1", ] -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common 0.1.7", - "inout 0.1.4", - "zeroize", -] - [[package]] name = "cipher" version = "0.5.2" @@ -697,7 +632,7 @@ checksum = "e8cf2a2c93cd704877c0858356ed03480ff301ee950b43f1cbe4573b088bfa6c" dependencies = [ "block-buffer 0.12.1", "crypto-common 0.2.2", - "inout 0.2.5", + "inout", ] [[package]] @@ -758,7 +693,7 @@ dependencies = [ "aws-lc-rs", "axum", "base64 0.23.1", - "blake2 0.11.0", + "blake2", "blake3", "bollard", "boring-noise", @@ -779,7 +714,7 @@ dependencies = [ "hickory-net", "hickory-proto", "hickory-resolver", - "hmac 0.13.0", + "hmac", "http", "http-body-util", "httpmock", @@ -822,7 +757,7 @@ dependencies = [ "syn 3.0.9", "sysinfo", "tempfile", - "thiserror 2.0.21", + "thiserror", "time", "tokio", "tokio-rustls", @@ -908,6 +843,15 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b" +[[package]] +name = "constant_time_eq" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eb6feb175df65d0a3ccd3e73484e940d0ac664e8034f0519fd49a93db3071d9" +dependencies = [ + "rustversion", +] + [[package]] name = "core-foundation" version = "0.9.4" @@ -1001,7 +945,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ "generic-array", - "rand_core 0.6.4", "typenum", ] @@ -1022,7 +965,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baaca1c4b237092596f64d571e9db6ce4109c4ef9742e27590f1709594461f21" dependencies = [ - "cipher 0.5.2", + "cipher", ] [[package]] @@ -1036,12 +979,12 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.3" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" +checksum = "b5eed333089e2e1c1ac8c6c0398e5e2497b4c9926ca6d0365ed1e099afa5bc23" dependencies = [ "cfg-if", - "cpufeatures 0.2.17", + "cpufeatures 0.3.1", "curve25519-dalek-derive", "fiat-crypto", "rustc_version", @@ -1069,9 +1012,9 @@ dependencies = [ "cfg-if", "crossbeam-utils", "hashbrown 0.14.5", - "lock_api", + "lock_api 0.4.14", "once_cell", - "parking_lot_core", + "parking_lot_core 0.9.12", ] [[package]] @@ -1117,7 +1060,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71958f69fb2de856c5dd51ac9377e986ca1aa5919f931bf5395a807277f889a0" dependencies = [ - "thiserror 2.0.21", + "thiserror", ] [[package]] @@ -1150,7 +1093,7 @@ dependencies = [ "hickory-proto", "ipnet", "rand 0.10.3", - "thiserror 2.0.21", + "thiserror", ] [[package]] @@ -1172,7 +1115,6 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", "crypto-common 0.1.7", - "subtle", ] [[package]] @@ -1360,15 +1302,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "etherparse" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "827292ea592108849932ad8e30218f8b1f21c0dfd0696698a18b5d0aed62d990" -dependencies = [ - "arrayvec", -] - [[package]] name = "etherparse" version = "0.16.0" @@ -1418,9 +1351,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.9" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" +checksum = "64cd1e32ddd350061ae6edb1b082d7c54915b5c672c389143b9a63403a109f24" [[package]] name = "filetime" @@ -1802,7 +1735,7 @@ dependencies = [ "quinn", "rand 0.10.3", "rustls", - "thiserror 2.0.21", + "thiserror", "tinyvec", "tokio", "tokio-rustls", @@ -1828,7 +1761,7 @@ dependencies = [ "ring", "rustls-pki-types", "serde", - "thiserror 2.0.21", + "thiserror", "time", "tinyvec", "tracing", @@ -1851,7 +1784,7 @@ dependencies = [ "moka", "ndk-context", "once_cell", - "parking_lot", + "parking_lot 0.12.5", "quinn", "rand 0.10.3", "resolv-conf", @@ -1859,7 +1792,7 @@ dependencies = [ "serde", "smallvec", "system-configuration", - "thiserror 2.0.21", + "thiserror", "tokio", "tokio-rustls", "tracing", @@ -1887,7 +1820,7 @@ dependencies = [ "prefix-trie", "rustls", "serde", - "thiserror 2.0.21", + "thiserror", "time", "tokio", "tokio-rustls", @@ -1901,16 +1834,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4aaa26c720c68b866f2c96ef5c1264b3e6f473fe5d4ce61cd44bbe913e553018" dependencies = [ - "hmac 0.13.0", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest 0.10.7", + "hmac", ] [[package]] @@ -1975,19 +1899,15 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "httpmock" -version = "0.8.3" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4888a4d02d8e1f92ffb6b4965cf5ff56dda36ef41975f41c6fa0f6bde78c4e" +checksum = "654f72e90ee9871781fd37154c1c0049ef20f988f8a2931887dc285170e682ab" dependencies = [ "assert-json-diff", - "async-object-pool", - "async-trait", - "base64 0.22.1", + "base64 0.23.1", "bytes", - "crossbeam-utils", "form_urlencoded", "futures-timer", - "futures-util", "headers", "http", "http-body-util", @@ -1997,14 +1917,10 @@ dependencies = [ "regex", "serde", "serde_json", - "serde_regex", "similar", - "stringmetrics", - "tabwriter", - "thiserror 2.0.21", + "thiserror", "tokio", "tracing", - "url", ] [[package]] @@ -2252,15 +2168,6 @@ dependencies = [ "libc", ] -[[package]] -name = "inout" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" -dependencies = [ - "generic-array", -] - [[package]] name = "inout" version = "0.2.5" @@ -2374,7 +2281,7 @@ dependencies = [ "jni-sys", "log", "simd_cesu8", - "thiserror 2.0.21", + "thiserror", "walkdir", "windows-link 0.2.1", ] @@ -2501,6 +2408,15 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "lock_api" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65d91b22da179613dcf4d6ec8349563f52a363f6849e03b00dd0a185ec4a59af" +dependencies = [ + "scopeguard", +] + [[package]] name = "log" version = "0.4.34" @@ -2549,7 +2465,7 @@ dependencies = [ "ipnetwork", "memchr", "serde", - "thiserror 2.0.21", + "thiserror", ] [[package]] @@ -2663,7 +2579,7 @@ dependencies = [ "crossbeam-epoch", "crossbeam-utils", "equivalent", - "parking_lot", + "parking_lot 0.12.5", "portable-atomic", "smallvec", "tagptr", @@ -2698,22 +2614,11 @@ dependencies = [ "nix 0.30.1", "scopeguard", "system-configuration-sys", - "thiserror 2.0.21", + "thiserror", "widestring", "windows 0.61.3", ] -[[package]] -name = "netlink-packet-core" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72724faf704479d67b388da142b186f916188505e7e0b26719019c525882eda4" -dependencies = [ - "anyhow", - "byteorder", - "netlink-packet-utils", -] - [[package]] name = "netlink-packet-core" version = "0.8.2" @@ -2756,29 +2661,15 @@ dependencies = [ [[package]] name = "netlink-packet-sock-diag" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a495cb1de50560a7cd12fdcf023db70eec00e340df81be31cedbbfd4aadd6b76" +checksum = "55169f3ffef150fcfbeda8ab1d9766ce69e02f27f8bc1601555ec3b7a2a84377" dependencies = [ - "anyhow", - "bitflags 1.3.2", - "byteorder", + "bitflags 2.13.2", "libc", - "netlink-packet-core 0.7.0", - "netlink-packet-utils", + "netlink-packet-core 0.9.0", "smallvec", -] - -[[package]] -name = "netlink-packet-utils" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ede8a08c71ad5a95cdd0e4e52facd37190977039a4704eb82a283f713747d34" -dependencies = [ - "anyhow", - "byteorder", - "paste", - "thiserror 1.0.69", + "zerocopy", ] [[package]] @@ -2793,7 +2684,7 @@ dependencies = [ "log", "netlink-packet-core 0.9.0", "netlink-sys 0.9.0", - "thiserror 2.0.21", + "thiserror", ] [[package]] @@ -2844,7 +2735,7 @@ checksum = "4ddcb8865ad3d9950f22f42ffa0ef0aecbfbf191867b3122413602b0a360b2a6" dependencies = [ "cc", "libc", - "thiserror 2.0.21", + "thiserror", "winapi", ] @@ -3065,12 +2956,6 @@ version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" -[[package]] -name = "opaque-debug" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" - [[package]] name = "parking" version = "2.2.1" @@ -3083,8 +2968,18 @@ version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" dependencies = [ - "lock_api", - "parking_lot_core", + "lock_api 0.4.14", + "parking_lot_core 0.9.12", +] + +[[package]] +name = "parking_lot" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9cf937ca4e1d0b7578784559063422fc39ae7c5a00f02471f2614d5486fd226" +dependencies = [ + "lock_api 0.5.0", + "parking_lot_core 0.10.0", ] [[package]] @@ -3095,7 +2990,19 @@ checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.5.18", + "smallvec", + "windows-link 0.2.1", +] + +[[package]] +name = "parking_lot_core" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cfff060068cc18aa7815010fcaf80c68c7fb9e85fc7f5c0f9bf142c21d19826" +dependencies = [ + "libc", + "redox_syscall 0.9.5", "smallvec", "windows-link 0.2.1", ] @@ -3174,17 +3081,6 @@ version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" -[[package]] -name = "poly1305" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" -dependencies = [ - "cpufeatures 0.2.17", - "opaque-debug", - "universal-hash 0.5.1", -] - [[package]] name = "poly1305" version = "0.9.1" @@ -3192,7 +3088,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e2d0073b297041425c7c3df6eb4792d598a15323fe63346852b092eca02904c" dependencies = [ "cpufeatures 0.3.1", - "universal-hash 0.6.1", + "universal-hash", ] [[package]] @@ -3203,7 +3099,7 @@ checksum = "f0fa31d631f2b2cb2a544d0aa321ce847a94764d701ca2becc411138b93d49cd" dependencies = [ "cpubits", "cpufeatures 0.3.1", - "universal-hash 0.6.1", + "universal-hash", ] [[package]] @@ -3329,7 +3225,7 @@ dependencies = [ "rustc-hash", "rustls", "socket2", - "thiserror 2.0.21", + "thiserror", "tokio", "tracing", "web-time", @@ -3352,7 +3248,7 @@ dependencies = [ "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.21", + "thiserror", "tinyvec", "tracing", "web-time", @@ -3420,7 +3316,7 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65c9fb96cbc91e3478eaae79a69fcd3f1ae4ad052e471fe6732fff548984b4af" dependencies = [ - "chacha20 0.10.2", + "chacha20", "getrandom 0.4.3", "rand_core 0.10.1", ] @@ -3501,6 +3397,15 @@ dependencies = [ "bitflags 2.13.2", ] +[[package]] +name = "redox_syscall" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "580c875845b41ecb1564ad1ae4703044cef774145e3d7a94dc2b3fa7c97868fd" +dependencies = [ + "bitflags 2.13.2", +] + [[package]] name = "regex" version = "1.13.1" @@ -3578,7 +3483,7 @@ dependencies = [ "netlink-proto", "netlink-sys 0.9.0", "nix 0.30.1", - "thiserror 2.0.21", + "thiserror", "tokio", ] @@ -3809,16 +3714,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "serde_regex" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bafc8d0c5330cecff10f16b459b479fd9acaa5b4acd7167301414e21b0057012" -dependencies = [ - "regex", - "serde", -] - [[package]] name = "serde_repr" version = "0.1.21" @@ -3852,7 +3747,7 @@ dependencies = [ "futures-util", "log", "once_cell", - "parking_lot", + "parking_lot 0.12.5", "serial_test_derive", ] @@ -3937,7 +3832,7 @@ dependencies = [ "shadowsocks-crypto", "socket2", "spin 0.12.3", - "thiserror 2.0.21", + "thiserror", "tokio", "tokio-tfo", "trait-variant", @@ -3951,7 +3846,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b404a62ebea5003f44b9a2748dee7555c5f9ae39896508e466a2a91ee6fa5df5" dependencies = [ - "aead 0.6.1", + "aead", "aes", "aes-gcm", "aes-gcm-siv", @@ -3961,8 +3856,8 @@ dependencies = [ "camellia", "ccm", "cfg-if", - "chacha20 0.10.2", - "chacha20poly1305 0.11.0", + "chacha20", + "chacha20poly1305", "ctr", "ghash", "hkdf", @@ -4016,9 +3911,12 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "similar" -version = "2.7.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa" +checksum = "d2f8bec09ae8fae0f4f265a4559a9334be3929d8504e9b536df0a41302bd1733" +dependencies = [ + "bstr", +] [[package]] name = "slab" @@ -4032,7 +3930,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff2d621883cdeeaee6759d39f4bc8cd314b29db72b6ac3d6714b31422512ee11" dependencies = [ - "cipher 0.5.2", + "cipher", ] [[package]] @@ -4076,12 +3974,12 @@ name = "sock2proc" version = "0.2.1" dependencies = [ "libc", - "netlink-packet-core 0.7.0", + "netlink-packet-core 0.9.0", "netlink-packet-sock-diag", - "netlink-sys 0.8.8", + "netlink-sys 0.9.0", "sysctl", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -4100,7 +3998,7 @@ version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3763264f6b73151db08c50ff20d7d8a0b8796e021cdea7ceedad07b80155fa0e" dependencies = [ - "lock_api", + "lock_api 0.4.14", ] [[package]] @@ -4109,7 +4007,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0134f9043ed38b087ac4f7d4af44c79e2c9e5094421fe3164f435ce585953b10" dependencies = [ - "lock_api", + "lock_api 0.4.14", ] [[package]] @@ -4118,12 +4016,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" -[[package]] -name = "stringmetrics" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3c8667cd96245cbb600b8dec5680a7319edd719c5aa2b5d23c6bff94f39765" - [[package]] name = "strsim" version = "0.11.1" @@ -4194,23 +4086,23 @@ dependencies = [ [[package]] name = "sysctl" -version = "0.5.5" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" +checksum = "cca424247104946a59dacd27eaad296223b7feec3d168a6dd04585183091eb0b" dependencies = [ "bitflags 2.13.2", "byteorder", "enum-as-inner", "libc", - "thiserror 1.0.69", + "thiserror", "walkdir", ] [[package]] name = "sysinfo" -version = "0.39.6" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2071df9448915b71c4fe6d25deaf1c22f12bd234f01540b77312bb8e41361e6" +checksum = "0e8a3edbe0394ce115f3917a00349dd242be09eb5a091ed509eaf67b55cfb8a8" dependencies = [ "libc", "memchr", @@ -4242,15 +4134,6 @@ dependencies = [ "libc", ] -[[package]] -name = "tabwriter" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce91f2f0ec87dff7e6bcbbeb267439aa1188703003c6055193c821487400432" -dependencies = [ - "unicode-width", -] - [[package]] name = "tagptr" version = "0.2.0" @@ -4276,33 +4159,13 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683" -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl 1.0.69", -] - [[package]] name = "thiserror" version = "2.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09e52cb86a36cede5cb101bf8908837b3e4c6e5e59fe7fd85c23fb56200d189e" dependencies = [ - "thiserror-impl 2.0.21", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.119", + "thiserror-impl", ] [[package]] @@ -4382,7 +4245,7 @@ dependencies = [ "bytes", "libc", "mio", - "parking_lot", + "parking_lot 0.12.5", "pin-project-lite", "signal-hook-registry", "socket2", @@ -4564,7 +4427,7 @@ checksum = "050686193eb999b4bb3bc2acfa891a13da00f79734704c4b8b4ef1a10b368a3c" dependencies = [ "crossbeam-channel", "symlink", - "thiserror 2.0.21", + "thiserror", "time", "tracing-subscriber", ] @@ -4639,9 +4502,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tun-rs" -version = "2.8.14" +version = "2.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46777ddd15e2f2a712e1b9e0c03034f6027f0da4038e5e106a54e9c1720bdf2" +checksum = "280a6cc03289f9254d9268eadd5712c476dbd7a47ef51aae86e8b9d0b45dcd43" dependencies = [ "ahash", "blocking", @@ -4677,7 +4540,7 @@ dependencies = [ "log", "rand 0.9.5", "sha1 0.10.7", - "thiserror 2.0.21", + "thiserror", ] [[package]] @@ -4693,7 +4556,7 @@ dependencies = [ "log", "rand 0.10.3", "sha1 0.11.0", - "thiserror 2.0.21", + "thiserror", ] [[package]] @@ -4720,22 +4583,6 @@ version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563" -[[package]] -name = "unicode-width" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" - -[[package]] -name = "universal-hash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" -dependencies = [ - "crypto-common 0.1.7", - "subtle", -] - [[package]] name = "universal-hash" version = "0.6.1" @@ -5355,13 +5202,12 @@ checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc" [[package]] name = "x25519-dalek" -version = "2.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" +checksum = "e7e8131a03190127fb2263afc72b322ecadae46b6ff8c6f399ff5d02f5559af6" dependencies = [ "curve25519-dalek", - "rand_core 0.6.4", - "serde", + "rand_core 0.10.1", "zeroize", ] @@ -5379,7 +5225,7 @@ dependencies = [ "oid-registry", "ring", "rusticata-macros", - "thiserror 2.0.21", + "thiserror", "time", ] @@ -5394,7 +5240,7 @@ dependencies = [ "http-body-util", "hyper", "hyper-util", - "thiserror 2.0.21", + "thiserror", "tokio", "tokio-stream", "uuid", @@ -5492,20 +5338,6 @@ name = "zeroize" version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e13084392c5e4bc371903e2935a5eaeed24905a7511356b883835e18a78f6879" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c50655cbb0fe3fc43170059e702f1ce5e19b84cec58dc87b037a09935c2f328" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.119", -] [[package]] name = "zerotrie" diff --git a/clash-lib/Cargo.toml b/clash-lib/Cargo.toml index e682998d..0314cfc1 100644 --- a/clash-lib/Cargo.toml +++ b/clash-lib/Cargo.toml @@ -51,7 +51,7 @@ ipnet = { version = "2" } lru_time_cache = "0.11" ip_network_table-deps-treebitmap = "0.5" network-interface = { version = "2" } -sysinfo = { version = "0.39", features = ["network"] } +sysinfo = { version = "0.40", features = ["network"] } serde = { version = "1", features = ["derive"] } serde_path_to_error = "0.1" @@ -264,7 +264,7 @@ rcgen = "0.14" mockall = "0.15.0" tokio-test = "0.4.5" serial_test = "4.0" -httpmock = "0.8.3" +httpmock = "0.9.0" syn = { version = "3", features = ["full", "visit"] } [lints] diff --git a/vendor/boring-noise/Cargo.toml b/vendor/boring-noise/Cargo.toml index 281070a1..ecfcc7c8 100644 --- a/vendor/boring-noise/Cargo.toml +++ b/vendor/boring-noise/Cargo.toml @@ -17,32 +17,32 @@ ring = ["dep:ring", "dep:constant_time_eq"] aws-lc-rs = ["dep:aws-lc-rs"] [dependencies] -parking_lot = "0.12" +parking_lot = "0.13" tracing = "0.1.40" aws-lc-rs = { version = "1", optional = true } ring = { version = "0.17", optional = true } -constant_time_eq = { version = "0.4", optional = true } +constant_time_eq = { version = "0.6", optional = true } -x25519-dalek = { version = "2.0.0", features = [ +x25519-dalek = { version = "3.0.0", features = [ "reusable_secrets", "static_secrets", ] } rand_core = { version = "0.6.4", features = ["getrandom"] } -chacha20poly1305 = "0.10.0-pre.1" -aead = "0.5.0-pre.2" -blake2 = "0.10" -hmac = "0.12" +chacha20poly1305 = "0.11.0" +aead = "0.6.1" +blake2 = "0.11" +hmac = "0.13" mock_instant = { version = "0.6.0", optional = true } portable-atomic = "1" [target.'cfg(unix)'.dependencies] -nix = { version = "0.30.1", default-features = false, features = [ +nix = { version = "0.31.3", default-features = false, features = [ "time", "user", ] } [dev-dependencies] -etherparse = "0.13" +etherparse = "0.21" [lib] crate-type = ["rlib"] diff --git a/vendor/sock2proc/Cargo.toml b/vendor/sock2proc/Cargo.toml index 7523d8d7..cf2ca463 100644 --- a/vendor/sock2proc/Cargo.toml +++ b/vendor/sock2proc/Cargo.toml @@ -8,12 +8,12 @@ libc = "0.2" tracing = "0.1" [target.'cfg(target_os = "linux")'.dependencies] -netlink-packet-sock-diag = "0.4.2" -netlink-packet-core = "0.7.0" -netlink-sys = "0.8.6" +netlink-packet-sock-diag = "0.5.0" +netlink-packet-core = "0.9.0" +netlink-sys = "0.9.0" [target.'cfg(target_os = "macos")'.dependencies] -sysctl = "0.5.5" +sysctl = "0.7.1" [target.'cfg(target_os = "windows")'.dependencies] -windows-sys = { version = "0.52", features = ["Win32_Foundation", "Win32_NetworkManagement_IpHelper", "Win32_System_Threading", "Win32_Networking_WinSock"] } +windows-sys = { version = "0.61", features = ["Win32_Foundation", "Win32_NetworkManagement_IpHelper", "Win32_System_Threading", "Win32_Networking_WinSock"] }