Skip to content

Commit

Permalink
upgrade rustls to 0.19 and tokio-rustls to 0.21
Browse files Browse the repository at this point in the history
  • Loading branch information
@bluejekyll
bluejekyll committed Nov 29, 2020
1 parent a1c4cdc commit a44e3f3
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 47 deletions.
65 changes: 35 additions & 30 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions bin/Cargo.toml
View file
Expand Up @@ -75,7 +75,7 @@ chrono = "0.4"
clap = "2.33"
futures = { version = "0.3.5", default-features = false, features = ["std"] }
log = "0.4"
rustls = { version = "0.18", optional = true }
rustls = { version = "0.19", optional = true }
tokio = { version = "0.3.0", features = ["time"] }
trust-dns-client = { version = "0.20.0-alpha.3", path = "../crates/client" }
trust-dns-openssl = { version = "0.20.0-alpha.3", path = "../crates/openssl", optional = true }
Expand All @@ -91,4 +91,4 @@ trust-dns-proto = { version = "0.20.0-alpha.3", path = "../crates/proto", featur
trust-dns-native-tls = { version = "0.20.0-alpha.3", path = "../crates/native-tls" }
trust-dns-https = { version = "0.20.0-alpha.3", path = "../crates/https" }
trust-dns-resolver = { version = "0.20.0-alpha.3", path = "../crates/resolver" }
webpki-roots = { version = "0.20" }
webpki-roots = "0.21"
2 changes: 1 addition & 1 deletion crates/client/Cargo.toml
View file
Expand Up @@ -77,7 +77,7 @@ openssl = { version = "0.10", features = ["v102", "v110"], optional = true }
radix_trie = "0.2.0"
rand = "0.7"
ring = { version = "0.16", optional = true, features = ["std"]}
rustls = { version = "0.18", optional = true }
rustls = { version = "0.19", optional = true }
serde = { version = "1.0", features = ["derive"], optional = true }
thiserror = "1.0.20"
tokio = { version = "0.3.0", features = ["rt"] }
Expand Down
8 changes: 4 additions & 4 deletions crates/https/Cargo.toml
View file
Expand Up @@ -48,20 +48,20 @@ path = "src/lib.rs"

[dependencies]
cfg-if = "1"
bytes = "0.5"
bytes = "0.6"
data-encoding = "2.2.0"
futures-util = { version = "0.3.5", default-features = false, features = ["std"] }
h2 = { version = "0.3.0", features = ["stream"] }
http = "0.2"
log = "0.4"
rustls = "0.18"
rustls = "0.19"
thiserror = "1.0.20"
tokio = { version = "0.3", features = ["io-util", "net", "rt"] }
tokio-rustls = "0.20.0"
tokio-rustls = "0.21.0"
# disables default features, i.e. openssl...
trust-dns-proto = { version = "0.20.0-alpha.3", path = "../proto", features = ["tokio-runtime"], default-features = false }
trust-dns-rustls = { version = "0.20.0-alpha.3", path = "../rustls", default-features = false }
webpki-roots = { version = "0.20" }
webpki-roots = "0.21"
webpki = "0.21"

[dev-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions crates/resolver/Cargo.toml
View file
Expand Up @@ -73,20 +73,20 @@ log = "0.4"
lru-cache = "0.1.2"
parking_lot = "0.11"
resolv-conf = { version = "0.7.0", optional = true, features = ["system"] }
rustls = {version = "0.18", optional = true}
rustls = {version = "0.19", optional = true}
serde = { version = "1.0", features = ["derive"], optional = true }
smallvec = "1.2"
thiserror = "1.0.20"
tokio = { version = "0.3.0", optional = true }
tokio-native-tls = { version = "0.2", optional = true }
tokio-openssl = { version = "0.5.0", optional = true }
tokio-rustls = { version = "0.20", optional = true }
tokio-rustls = { version = "0.21", optional = true }
trust-dns-https = { version = "0.20.0-alpha.3", path = "../https", optional = true }
trust-dns-native-tls = { version = "0.20.0-alpha.3", path = "../native-tls", optional = true }
trust-dns-openssl = { version = "0.20.0-alpha.3", path = "../openssl", optional = true }
trust-dns-proto = { version = "0.20.0-alpha.3", path = "../proto", default-features = false }
trust-dns-rustls = { version = "0.20.0-alpha.3", path = "../rustls", optional = true }
webpki-roots = { version = "0.20", optional = true }
webpki-roots = { version = "0.21", optional = true }

[target.'cfg(windows)'.dependencies]
ipconfig = { version = "0.2.2", optional = true }
Expand Down
4 changes: 2 additions & 2 deletions crates/rustls/Cargo.toml
View file
Expand Up @@ -51,9 +51,9 @@ futures-channel = { version = "0.3.5", default-features = false, features = ["st
futures-io = { version = "0.3.5", default-features = false, features = ["std"] }
futures-util = { version = "0.3.5", default-features = false, features = ["std"] }
log = "0.4"
rustls = "0.18"
rustls = "0.19"
tokio = { version = "0.3.0", features = ["io-util", "net"] }
tokio-rustls = { version = "0.20", features = ["early-data"] }
tokio-rustls = { version = "0.21", features = ["early-data"] }
# disables default features, i.e. openssl...
trust-dns-proto = { version = "0.20.0-alpha.3", path = "../proto", features = ["tokio-runtime"], default-features = false }
webpki = "0.21"
Expand Down
6 changes: 3 additions & 3 deletions crates/server/Cargo.toml
View file
Expand Up @@ -71,7 +71,7 @@ name = "trust_dns_server"
path = "src/lib.rs"

[dependencies]
bytes = "0.5"
bytes = "0.6"
cfg-if = "1"
chrono = "0.4"
enum-as-inner = "0.3"
Expand All @@ -83,12 +83,12 @@ http = { version = "0.2", optional = true }
log = "0.4"
openssl = { version = "0.10", features = ["v102", "v110"], optional = true }
rusqlite = { version = "0.24.0", features = ["bundled", "chrono"], optional = true }
rustls = { version = "0.18", optional = true }
rustls = { version = "0.19", optional = true }
serde = { version = "1.0.114", features = ["derive"] }
thiserror = "1.0.20"
tokio = { version = "0.3.0", features = ["stream", "net"] }
tokio-openssl = { version = "0.5.0", optional = true }
tokio-rustls = { version = "0.20", optional = true }
tokio-rustls = { version = "0.21", optional = true }
toml = "0.5"
trust-dns-client= { version = "0.20.0-alpha.3", path = "../client" }
trust-dns-https = { version = "0.20.0-alpha.3", path = "../https", optional = true }
Expand Down
4 changes: 2 additions & 2 deletions tests/integration-tests/Cargo.toml
View file
Expand Up @@ -76,7 +76,7 @@ futures = "0.3.5"
openssl = { version = "0.10", features = ["v102", "v110"] }
rand = "0.7"
rusqlite = { version = "0.24.0", features = ["bundled"] }
rustls = "0.18"
rustls = "0.19"
tokio = { version = "0.3.0", features = ["time", "rt"] }
trust-dns-client= { version = "0.20.0-alpha.3", path = "../../crates/client" }
trust-dns-https = { version = "0.20.0-alpha.3", path = "../../crates/https" }
Expand All @@ -86,7 +86,7 @@ trust-dns-resolver = { version = "0.20.0-alpha.3", path = "../../crates/resolver
trust-dns-rustls = { version = "0.20.0-alpha.3", path = "../../crates/rustls" }
# TODO: fixup tests to not require openssl
trust-dns-server = { version = "0.20.0-alpha.3", path = "../../crates/server" }
webpki-roots = { version = "0.20", optional = true }
webpki-roots = { version = "0.21", optional = true }

[dev-dependencies]
futures = { version = "0.3.5", features = ["thread-pool"] }

0 comments on commit a44e3f3

Please sign in to comment.