diff --git a/Cargo.lock b/Cargo.lock index 10c55f5..ced2bb7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1371,8 +1371,20 @@ dependencies = [ "base64", "log", "ring", - "sct", - "webpki", + "sct 0.6.1", + "webpki 0.21.4", +] + +[[package]] +name = "rustls" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d37e5e2290f3e040b594b1a9e04377c2c671f1a1cfd9bfdef82106ac1c113f84" +dependencies = [ + "log", + "ring", + "sct 0.7.0", + "webpki 0.22.0", ] [[package]] @@ -1382,7 +1394,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" dependencies = [ "openssl-probe", - "rustls", + "rustls 0.19.1", "schannel", "security-framework", ] @@ -1428,6 +1440,16 @@ dependencies = [ "untrusted", ] +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "security-framework" version = "2.3.1" @@ -1634,7 +1656,7 @@ dependencies = [ "thiserror", "tokio", "tokio-native-tls", - "tokio-rustls", + "tokio-rustls 0.23.2", "tower", "trust-dns-resolver", "tun", @@ -1905,9 +1927,20 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ - "rustls", + "rustls 0.19.1", "tokio", - "webpki", + "webpki 0.21.4", +] + +[[package]] +name = "tokio-rustls" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a27d5f2b839802bd8267fa19b0530f5a08b9c08cd417976be2a65d130fe1c11b" +dependencies = [ + "rustls 0.20.2", + "tokio", + "webpki 0.22.0", ] [[package]] @@ -2001,13 +2034,13 @@ dependencies = [ "h2", "http", "log", - "rustls", + "rustls 0.19.1", "thiserror", "tokio", - "tokio-rustls", + "tokio-rustls 0.22.0", "trust-dns-proto", "trust-dns-rustls", - "webpki", + "webpki 0.21.4", "webpki-roots", ] @@ -2051,12 +2084,12 @@ dependencies = [ "lru-cache", "parking_lot", "resolv-conf", - "rustls", + "rustls 0.19.1", "serde", "smallvec", "thiserror", "tokio", - "tokio-rustls", + "tokio-rustls 0.22.0", "trust-dns-https", "trust-dns-proto", "trust-dns-rustls", @@ -2073,11 +2106,11 @@ dependencies = [ "futures-io", "futures-util", "log", - "rustls", + "rustls 0.19.1", "tokio", - "tokio-rustls", + "tokio-rustls 0.22.0", "trust-dns-proto", - "webpki", + "webpki 0.21.4", ] [[package]] @@ -2296,13 +2329,23 @@ dependencies = [ "untrusted", ] +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "webpki-roots" version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" dependencies = [ - "webpki", + "webpki 0.21.4", ] [[package]] diff --git a/crates/shadowsocks-service/Cargo.toml b/crates/shadowsocks-service/Cargo.toml index 485e91a..3ca0ca6 100644 --- a/crates/shadowsocks-service/Cargo.toml +++ b/crates/shadowsocks-service/Cargo.toml @@ -89,7 +89,7 @@ futures = "0.3" tokio = { version = "1.5", features = ["io-util", "macros", "net", "parking_lot", "rt", "sync", "time"] } tokio-native-tls = { version = "0.3", optional = true } native-tls = { version = "0.2.8", optional = true, features = ["alpn"] } -tokio-rustls = { version = "0.22", optional = true } +tokio-rustls = { version = "0.23", optional = true } webpki-roots = { version = "0.21", optional = true } rustls-native-certs = { version = "0.5", optional = true } async-trait = "0.1"