diff --git a/Cargo.lock b/Cargo.lock index c123ec293..856994a0f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -773,7 +773,6 @@ dependencies = [ "rand_core 0.6.3", "regex", "rfc6979 0.2.0", - "ring", "serde", "serde_json", "sha2", @@ -2818,8 +2817,6 @@ dependencies = [ [[package]] name = "ring" version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" dependencies = [ "cc", "libc", @@ -2955,6 +2952,16 @@ dependencies = [ "semver 1.0.9", ] +[[package]] +name = "rustls" +version = "0.20.6" +dependencies = [ + "log", + "ring", + "sct 0.6.1", + "webpki 0.22.0", +] + [[package]] name = "rustls" version = "0.20.6" @@ -2963,8 +2970,8 @@ checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" dependencies = [ "log", "ring", - "sct", - "webpki", + "sct 0.7.0", + "webpki 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2994,6 +3001,14 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "sct" +version = "0.6.1" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "sct" version = "0.7.0" @@ -3227,6 +3242,7 @@ dependencies = [ "rand_chacha 0.3.1", "rkyv", "root-keys", + "rustls 0.20.6", "sha2", "spectrum-analyzer", "spinor", @@ -3819,11 +3835,11 @@ dependencies = [ "flate2", "log", "once_cell", - "rustls", + "rustls 0.20.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde", "serde_json", "url", - "webpki", + "webpki 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", "webpki-roots", ] @@ -4240,6 +4256,14 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki" +version = "0.22.0" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "webpki" version = "0.22.0" @@ -4256,7 +4280,7 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf" dependencies = [ - "webpki", + "webpki 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 616e70544..43598f5ed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -135,3 +135,6 @@ branch="main" [patch.crates-io.getrandom] path = "imports/getrandom" + +[patch.crates-io.ring] +path = "../ring" \ No newline at end of file diff --git a/apps/vault/libraries/crypto/Cargo.toml b/apps/vault/libraries/crypto/Cargo.toml index 015308092..cd765202d 100644 --- a/apps/vault/libraries/crypto/Cargo.toml +++ b/apps/vault/libraries/crypto/Cargo.toml @@ -32,7 +32,7 @@ untrusted = { version = "0.7.0" } hex = { version = "0.3.2", default-features = false } # do not update this, it's required to be at this version for tests to work. serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0" } -ring = { version = "0.16.11" } +# ring = { version = "0.16.11" } byteorder = { version = "1", default-features = false } rfc6979 = "0.2.0" diff --git a/services/shellchat/Cargo.toml b/services/shellchat/Cargo.toml index 5d1f0b239..50e040408 100644 --- a/services/shellchat/Cargo.toml +++ b/services/shellchat/Cargo.toml @@ -72,6 +72,10 @@ tracking-allocator = {version = "0.3.0", optional = true} tracing = {version = "0.1.35", optional = true} tracing-subscriber = {version = "0.3.11", optional = true} +# for rustls testing +#rustls = "0.20.6" +rustls = {path="../../../rustls/rustls"} + # for the curve25519 tests # hardware acceleration adaptations are inserted into a fork of the main branch. hex = {version = "0.4.3", default-features = false, features = []}