From 5757a5badf7240ae1ec051dfd79418d37d592761 Mon Sep 17 00:00:00 2001 From: Christien Rioux Date: Sun, 15 Oct 2023 12:48:03 -0400 Subject: [PATCH] rustls update --- Cargo.lock | 20 ++++++++++++++------ Cargo.toml | 1 + veilid-core/Cargo.toml | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cb0a0243..7479c450 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -459,14 +459,12 @@ checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" [[package]] name = "async-tls" version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfeefd0ca297cbbb3bd34fd6b228401c2a5177038257afd751bc29f0a2da4795" +source = "git+https://github.com/async-rs/async-tls?rev=c58588a#c58588a276e6180f3ef99f4ec3bf9176c5f0f58c" dependencies = [ "futures-core", "futures-io", "rustls", "rustls-pemfile", - "webpki", "webpki-roots 0.22.6", ] @@ -4077,14 +4075,14 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.9" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring 0.16.20", + "rustls-webpki", "sct", - "webpki", ] [[package]] @@ -4096,6 +4094,16 @@ dependencies = [ "base64 0.21.4", ] +[[package]] +name = "rustls-webpki" +version = "0.101.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" +dependencies = [ + "ring 0.16.20", + "untrusted 0.7.1", +] + [[package]] name = "rustversion" version = "1.0.14" diff --git a/Cargo.toml b/Cargo.toml index b9b4a26c..6d621f4d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,6 +12,7 @@ resolver = "2" [patch.crates-io] cursive = { git = "https://gitlab.com/veilid/cursive.git" } cursive_core = { git = "https://gitlab.com/veilid/cursive.git" } +async-tls = { git = "https://github.com/async-rs/async-tls", rev = "c58588a" } # For local development # keyvaluedb = { path = "../keyvaluedb/keyvaluedb" } diff --git a/veilid-core/Cargo.toml b/veilid-core/Cargo.toml index d694d51e..d0de0282 100644 --- a/veilid-core/Cargo.toml +++ b/veilid-core/Cargo.toml @@ -172,7 +172,7 @@ igd = { package = "veilid-igd", version = "0.1.1" } async-tls = "0.12.0" webpki = "0.22.1" webpki-roots = "0.25.2" -rustls = "=0.20.9" +rustls = "0.21.7" rustls-pemfile = "1.0.3" socket2 = { version = "0.5.4", features = ["all"] }