Skip to content

Commit

Permalink
update to use rustls 0.23
Browse files Browse the repository at this point in the history
  • Loading branch information
zh-jq-b committed May 8, 2024
1 parent e288973 commit c78a7a2
Show file tree
Hide file tree
Showing 35 changed files with 441 additions and 264 deletions.
128 changes: 102 additions & 26 deletions Cargo.lock

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

11 changes: 6 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,15 @@ async-trait = "0.1"
async-recursion = "1.1"
pin-project-lite = "0.2"
#
rustls = "0.21.12"
tokio-rustls = "0.24"
rustls = { version = "0.23.5", default-features = false, features = ["std", "tls12", "ring"] }
rustls-pki-types = "1"
rustls-pemfile = "2"
tokio-rustls = { version = "0.26", default-features = false, features = ["tls12", "ring"] }
quinn = { version = "0.10", default-features = false, features = ["native-certs"] }
#
openssl = { package = "variant-ssl", version = "0.14.2" }
openssl-sys = { package = "variant-ssl-sys", version = "0.13.0" }
openssl-probe = "0.1"
rustls-pemfile = "1.0"
rustls-native-certs = "0.6"
quinn = { version = "0.10", default-features = false, features = ["native-certs"] }
#
flume = { version = "0.11", default-features = false }
#
Expand Down
10 changes: 9 additions & 1 deletion demo/test-resolver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,13 @@ slog = { workspace = true, features = ["max_level_trace", "release_max_level_inf
slog-scope = "4"
slog-stdlog = "4"
g3-types = { workspace = true, features = ["async-log"] }
g3-resolver = { workspace = true, features = ["hickory"] }
g3-resolver.workspace = true
g3-stdlog.workspace = true

[features]
default = []
hickory = [ "g3-resolver/hickory" ]

[[bin]]
name = "test-resolver"
required-features = ["g3-resolver/hickory"]
1 change: 1 addition & 0 deletions g3bench/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ openssl.workspace = true
openssl-probe = { workspace = true, optional = true }
rustls.workspace = true
rustls-pemfile.workspace = true
rustls-pki-types.workspace = true
tokio-rustls.workspace = true
hdrhistogram.workspace = true
ahash.workspace = true
Expand Down
Loading

0 comments on commit c78a7a2

Please sign in to comment.