intermediate commit through experiments

This commit is contained in:
bunnie 2022-08-12 15:56:05 +08:00
parent 6fff73ace8
commit 2e0f1df894
4 changed files with 40 additions and 9 deletions

40
Cargo.lock generated
View file

@ -773,7 +773,6 @@ dependencies = [
"rand_core 0.6.3", "rand_core 0.6.3",
"regex", "regex",
"rfc6979 0.2.0", "rfc6979 0.2.0",
"ring",
"serde", "serde",
"serde_json", "serde_json",
"sha2", "sha2",
@ -2818,8 +2817,6 @@ dependencies = [
[[package]] [[package]]
name = "ring" name = "ring"
version = "0.16.20" version = "0.16.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
dependencies = [ dependencies = [
"cc", "cc",
"libc", "libc",
@ -2955,6 +2952,16 @@ dependencies = [
"semver 1.0.9", "semver 1.0.9",
] ]
[[package]]
name = "rustls"
version = "0.20.6"
dependencies = [
"log",
"ring",
"sct 0.6.1",
"webpki 0.22.0",
]
[[package]] [[package]]
name = "rustls" name = "rustls"
version = "0.20.6" version = "0.20.6"
@ -2963,8 +2970,8 @@ checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033"
dependencies = [ dependencies = [
"log", "log",
"ring", "ring",
"sct", "sct 0.7.0",
"webpki", "webpki 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -2994,6 +3001,14 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "sct"
version = "0.6.1"
dependencies = [
"ring",
"untrusted",
]
[[package]] [[package]]
name = "sct" name = "sct"
version = "0.7.0" version = "0.7.0"
@ -3227,6 +3242,7 @@ dependencies = [
"rand_chacha 0.3.1", "rand_chacha 0.3.1",
"rkyv", "rkyv",
"root-keys", "root-keys",
"rustls 0.20.6",
"sha2", "sha2",
"spectrum-analyzer", "spectrum-analyzer",
"spinor", "spinor",
@ -3819,11 +3835,11 @@ dependencies = [
"flate2", "flate2",
"log", "log",
"once_cell", "once_cell",
"rustls", "rustls 0.20.6 (registry+https://github.com/rust-lang/crates.io-index)",
"serde", "serde",
"serde_json", "serde_json",
"url", "url",
"webpki", "webpki 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
"webpki-roots", "webpki-roots",
] ]
@ -4240,6 +4256,14 @@ dependencies = [
"wasm-bindgen", "wasm-bindgen",
] ]
[[package]]
name = "webpki"
version = "0.22.0"
dependencies = [
"ring",
"untrusted",
]
[[package]] [[package]]
name = "webpki" name = "webpki"
version = "0.22.0" version = "0.22.0"
@ -4256,7 +4280,7 @@ version = "0.22.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf" checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf"
dependencies = [ dependencies = [
"webpki", "webpki 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]

View file

@ -135,3 +135,6 @@ branch="main"
[patch.crates-io.getrandom] [patch.crates-io.getrandom]
path = "imports/getrandom" path = "imports/getrandom"
[patch.crates-io.ring]
path = "../ring"

View file

@ -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. 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 = { version = "1.0", features = ["derive"] }
serde_json = { version = "1.0" } serde_json = { version = "1.0" }
ring = { version = "0.16.11" } # ring = { version = "0.16.11" }
byteorder = { version = "1", default-features = false } byteorder = { version = "1", default-features = false }
rfc6979 = "0.2.0" rfc6979 = "0.2.0"

View file

@ -72,6 +72,10 @@ tracking-allocator = {version = "0.3.0", optional = true}
tracing = {version = "0.1.35", optional = true} tracing = {version = "0.1.35", optional = true}
tracing-subscriber = {version = "0.3.11", 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 # for the curve25519 tests
# hardware acceleration adaptations are inserted into a fork of the main branch. # hardware acceleration adaptations are inserted into a fork of the main branch.
hex = {version = "0.4.3", default-features = false, features = []} hex = {version = "0.4.3", default-features = false, features = []}