diff --git a/Cargo.lock b/Cargo.lock index 0c1f82d6c297..2ba51ea1f2a7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -567,18 +567,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "enum-as-inner" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "enum-as-inner" version = "0.5.1" @@ -1776,20 +1764,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.1", + "rustls-pemfile", "schannel", "security-framework", ] -[[package]] -name = "rustls-pemfile" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360" -dependencies = [ - "base64", -] - [[package]] name = "rustls-pemfile" version = "1.0.1" @@ -2121,7 +2100,7 @@ dependencies = [ "rand", "shadowsocks", "tokio", - "trust-dns-proto 0.22.0", + "trust-dns-proto", ] [[package]] @@ -2523,15 +2502,15 @@ checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" [[package]] name = "trust-dns-proto" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" +checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" dependencies = [ "async-trait", "bytes", "cfg-if", "data-encoding", - "enum-as-inner 0.4.0", + "enum-as-inner", "futures-channel", "futures-io", "futures-util", @@ -2540,57 +2519,31 @@ dependencies = [ "idna", "ipnet", "lazy_static", - "log", "rand", "rustls", - "rustls-pemfile 0.3.0", + "rustls-pemfile", "serde", "smallvec", "thiserror", "tinyvec", "tokio", "tokio-rustls", + "tracing", "url", "webpki", "webpki-roots", ] -[[package]] -name = "trust-dns-proto" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner 0.5.1", - "futures-channel", - "futures-io", - "futures-util", - "idna", - "ipnet", - "lazy_static", - "rand", - "smallvec", - "thiserror", - "tinyvec", - "tokio", - "tracing", - "url", -] - [[package]] name = "trust-dns-resolver" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" +checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" dependencies = [ "cfg-if", "futures-util", "ipconfig", "lazy_static", - "log", "lru-cache", "parking_lot", "resolv-conf", @@ -2600,7 +2553,8 @@ dependencies = [ "thiserror", "tokio", "tokio-rustls", - "trust-dns-proto 0.21.2", + "tracing", + "trust-dns-proto", "webpki-roots", ] diff --git a/crates/shadowsocks-service/Cargo.toml b/crates/shadowsocks-service/Cargo.toml index 33282caab22d..e9f093e9c1c6 100644 --- a/crates/shadowsocks-service/Cargo.toml +++ b/crates/shadowsocks-service/Cargo.toml @@ -114,7 +114,7 @@ libc = "0.2" hyper = { version = "0.14.19", optional = true, features = ["full"] } tower = { version = "0.4", optional = true } -trust-dns-resolver = { version = "0.21", optional = true, features = ["serde-config"] } +trust-dns-resolver = { version = "0.22", optional = true, features = ["serde-config"] } idna = "0.2" ipnet = "2.3" diff --git a/crates/shadowsocks/Cargo.toml b/crates/shadowsocks/Cargo.toml index 433eea6f64b2..8a2850781c83 100644 --- a/crates/shadowsocks/Cargo.toml +++ b/crates/shadowsocks/Cargo.toml @@ -75,7 +75,7 @@ socket2 = { version = "0.4", features = ["all"] } tokio = { version = "1.9.0", features = ["io-util", "macros", "net", "parking_lot", "process", "rt", "sync", "time"] } tokio-tfo = "0.2.0" -trust-dns-resolver = { version = "0.21", optional = true } +trust-dns-resolver = { version = "0.22", optional = true } arc-swap = { version = "1.5", optional = true } notify = { version = "5.0.0-pre.15", optional = true }