From dfe3b31c5e35d705075da3b81a7dfe1d3aa7a35d Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Sat, 16 Jun 2018 08:09:42 -1000 Subject: [PATCH] Update Rustls to the latest Git version to fix a bug. (#1143) Using MS Edge and probably other clients with the Conduit proxy when TLS is enabled fails because Rustls doesn't take into consideration that Conduit only supports one signature scheme (ECDSA P-256 SHA-256). This bug was fixed in Rustls when ECDSA support was added, after the latest release. With this change MS Edge can talk to Conduit. Signed-off-by: Brian Smith --- Cargo.lock | 8 ++++---- Cargo.toml | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2aea7302e..5ec9db318 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -147,7 +147,7 @@ dependencies = [ "rand 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "ring 0.13.0-alpha5 (registry+https://github.com/rust-lang/crates.io-index)", - "rustls 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustls 0.12.0 (git+https://github.com/ctz/rustls)", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-connect 0.1.0 (git+https://github.com/carllerche/tokio-connect)", @@ -887,7 +887,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "rustls" version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/ctz/rustls#8a78639c7f670e5440ecfe5053c1809290245b59" dependencies = [ "base64 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1096,7 +1096,7 @@ name = "tokio-rustls" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rustls 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustls 0.12.0 (git+https://github.com/ctz/rustls)", "tokio 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "webpki 0.18.0-alpha4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1589,7 +1589,7 @@ dependencies = [ "checksum resolv-conf 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e1b086bb6a2659d6ba66e4aa21bde8a53ec03587cd5c80b83bdc3a330f35cab" "checksum ring 0.13.0-alpha5 (registry+https://github.com/rust-lang/crates.io-index)" = "3845516753f91b4511f9b17c917ea6fa4bc5a7853a9947b0f66731aff51cdef5" "checksum rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "aee45432acc62f7b9a108cc054142dac51f979e69e71ddce7d6fc7adf29e817e" -"checksum rustls 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab72e4883a4fc9fd5cd462a51c55d79f6a7b5c9483e8d73a2b7bca0b18430bcd" +"checksum rustls 0.12.0 (git+https://github.com/ctz/rustls)" = "" "checksum safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f" "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" "checksum sct 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4540aed8d71a5de961a8902cf356e28122bd62695eb5be1c214f84d8704097c" diff --git a/Cargo.toml b/Cargo.toml index 1f04e2159..6e773a840 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,3 +5,6 @@ members = [ "proxy/futures-mpsc-lossy", "proxy/router", ] + +[patch.crates-io] +rustls = { git = "https://github.com/ctz/rustls" }