diff --git a/Cargo.lock b/Cargo.lock index 98e338125..6de965e2f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -871,7 +871,7 @@ dependencies = [ "public-suffix", "rand", "regex", - "rustls", + "rustls 0.21.10", "rustls-pemfile", "security-framework", "serde", @@ -885,7 +885,7 @@ dependencies = [ "thiserror", "tokio", "tokio-boring", - "tokio-rustls", + "tokio-rustls 0.25.0", "tokio-test", "tokio-tungstenite 0.21.0", "tokio-util", @@ -1846,13 +1846,13 @@ dependencies = [ "once_cell", "rand", "ring 0.16.20", - "rustls", + "rustls 0.21.10", "rustls-pemfile", "serde", "thiserror", "tinyvec", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "tracing", "url", ] @@ -1872,12 +1872,12 @@ dependencies = [ "parking_lot 0.12.1", "rand", "resolv-conf", - "rustls", + "rustls 0.21.10", "serde", "smallvec", "thiserror", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "tracing", ] @@ -1896,12 +1896,12 @@ dependencies = [ "hickory-proto", "hickory-resolver", "http 0.2.11", - "rustls", + "rustls 0.21.10", "serde", "thiserror", "time", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "tokio-util", "tracing", ] @@ -3395,10 +3395,24 @@ checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring 0.17.7", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe6b63262c9fcac8659abfaa96cac103d28166d3ff3eaf8f412e19f3ae9e5a48" +dependencies = [ + "log", + "ring 0.17.7", + "rustls-pki-types", + "rustls-webpki 0.102.0", + "subtle", + "zeroize", +] + [[package]] name = "rustls-pemfile" version = "1.0.4" @@ -3408,6 +3422,12 @@ dependencies = [ "base64 0.21.5", ] +[[package]] +name = "rustls-pki-types" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -3418,6 +3438,17 @@ dependencies = [ "untrusted 0.9.0", ] +[[package]] +name = "rustls-webpki" +version = "0.102.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de2635c8bc2b88d367767c5de8ea1d8db9af3f6219eba28442242d9ab81d1b89" +dependencies = [ + "ring 0.17.7", + "rustls-pki-types", + "untrusted 0.9.0", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -4003,7 +4034,18 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.10", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls 0.22.1", + "rustls-pki-types", "tokio", ] diff --git a/clash_lib/Cargo.toml b/clash_lib/Cargo.toml index b4845b929..dd6a4e632 100644 --- a/clash_lib/Cargo.toml +++ b/clash_lib/Cargo.toml @@ -12,7 +12,7 @@ bench = ["criterion"] [dependencies] tokio = { version = "1", features = ["full"] } tokio-util = { version = "0.7", features = ["net", "codec", "io", "compat"] } -tokio-rustls = "0.24" +tokio-rustls = "0.25" thiserror = "1.0" async-trait = "0.1" anyhow = "1.0"