YGGverse/agate
1
0
Fork 0
mirror of https://github.com/YGGverse/agate.git synced 2026-04-08 12:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Upgrade rustls and tokio-rustls

Browse source 
Closes #250. Closes #248.
This commit is contained in:
Matt Brubeck 2023-04-03 08:25:30 -07:00
parent 475ed07a80
commit 402079117c
3 changed files with 25 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

46
Cargo.lock generated
View file

@ -18,11 +18,10 @@ dependencies = [
"once_cell", "once_cell",
"percent-encoding", "percent-encoding",
"rcgen", "rcgen",
"rustls 0.20.8", "rustls 0.21.0",
"tokio", "tokio",
"tokio-rustls 0.23.4", "tokio-rustls 0.24.0",
"url", "url",
"webpki 0.22.0",
] ]
[[package]] [[package]]
@ -155,7 +154,7 @@ dependencies = [
"tokio", "tokio",
"tokio-rustls 0.22.0", "tokio-rustls 0.22.0",
"url", "url",
"webpki 0.21.4", "webpki",
"webpki-roots", "webpki-roots",
"x509-signature", "x509-signature",
] ]
@ -365,19 +364,29 @@ dependencies = [
"log", "log",
"ring", "ring",
"sct 0.6.1", "sct 0.6.1",
"webpki 0.21.4", "webpki",
] ]
[[package]] [[package]]
name = "rustls" name = "rustls"
version = "0.20.8" version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" checksum = "07180898a28ed6a7f7ba2311594308f595e3dd2e3c3812fa0a80a47b45f17e5d"
dependencies = [ dependencies = [
"log", "log",
"ring", "ring",
"rustls-webpki",
"sct 0.7.0", "sct 0.7.0",
"webpki 0.22.0", ]
[[package]]
name = "rustls-webpki"
version = "0.100.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b"
dependencies = [
"ring",
"untrusted",
] ]
[[package]] [[package]]
@ -534,18 +543,17 @@ checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
dependencies = [ dependencies = [
"rustls 0.19.1", "rustls 0.19.1",
"tokio", "tokio",
"webpki 0.21.4", "webpki",
] ]
[[package]] [[package]]
name = "tokio-rustls" name = "tokio-rustls"
version = "0.23.4" version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5"
dependencies = [ dependencies = [
"rustls 0.20.8", "rustls 0.21.0",
"tokio", "tokio",
"webpki 0.22.0",
] ]
[[package]] [[package]]
@ -687,23 +695,13 @@ dependencies = [
"untrusted", "untrusted",
] ]
[[package]]
name = "webpki"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
dependencies = [
"ring",
"untrusted",
]
[[package]] [[package]]
name = "webpki-roots" name = "webpki-roots"
version = "0.21.1" version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940"
dependencies = [ dependencies = [
"webpki 0.21.4", "webpki",
] ]
[[package]] [[package]]

5
Cargo.toml
View file

@ -22,11 +22,10 @@ mime_guess = "2.0"
once_cell = "1.17" once_cell = "1.17"
percent-encoding = "2.2" percent-encoding = "2.2"
rcgen = { version = "0.10.0" } rcgen = { version = "0.10.0" }
rustls = "0.20.8" rustls = "0.21.0"
tokio-rustls = "0.23.4" tokio-rustls = "0.24.0"
tokio = { version = "1.27", features = ["fs", "io-util", "net", "rt-multi-thread", "sync"] } tokio = { version = "1.27", features = ["fs", "io-util", "net", "rt-multi-thread", "sync"] }
url = "2.3.1" url = "2.3.1"
webpki = "0.22.0"
[dev-dependencies] [dev-dependencies]
anyhow = "1.0" anyhow = "1.0"

2
tests/tests.rs
View file

@ -539,7 +539,7 @@ fn explicit_tls_version() {
.unwrap() .unwrap()
.downcast::<Error>() .downcast::<Error>()
.unwrap(), .unwrap(),
Error::AlertReceived(rustls::internal::msgs::enums::AlertDescription::ProtocolVersion) Error::AlertReceived(rustls::AlertDescription::ProtocolVersion)
) )
} }