From 46d517b2f75bfff84b49fe3abc57152dcbc55133 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Mon, 2 Oct 2023 12:49:50 +0200 Subject: [PATCH] cargo upgrades: updage all major versions of deps except opentelemetry --- Cargo.lock | 91 ++++++++++++++---------------------------------------- Cargo.toml | 10 +++--- 2 files changed, 28 insertions(+), 73 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bd605fc..f60efc6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -100,9 +100,9 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "async-compression" -version = "0.3.15" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +checksum = "bb42b2197bf15ccb092b62c74515dbd8b86d0effd934795f6687c93b6e679a2c" dependencies = [ "brotli", "flate2", @@ -702,21 +702,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-rustls" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" -dependencies = [ - "http", - "hyper", - "log", - "rustls 0.20.9", - "rustls-native-certs", - "tokio", - "tokio-rustls 0.23.4", -] - [[package]] name = "hyper-rustls" version = "0.24.1" @@ -726,9 +711,11 @@ dependencies = [ "futures-util", "http", "hyper", + "log", "rustls 0.21.7", + "rustls-native-certs", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", ] [[package]] @@ -1051,11 +1038,12 @@ dependencies = [ [[package]] name = "pem" -version = "1.1.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923" dependencies = [ - "base64 0.13.1", + "base64 0.21.4", + "serde", ] [[package]] @@ -1228,9 +1216,9 @@ dependencies = [ [[package]] name = "rcgen" -version = "0.10.0" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" +checksum = "52c4f3084aa3bc7dfbba4eff4fab2a54db4324965d8872ab933565e6fbd83bc6" dependencies = [ "pem", "ring", @@ -1306,7 +1294,7 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-rustls 0.24.1", + "hyper-rustls", "ipnet", "js-sys", "log", @@ -1320,7 +1308,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tower-service", "url", "wasm-bindgen", @@ -1375,19 +1363,7 @@ dependencies = [ "log", "ring", "sct 0.6.1", - "webpki 0.21.4", -] - -[[package]] -name = "rustls" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" -dependencies = [ - "log", - "ring", - "sct 0.7.0", - "webpki 0.22.2", + "webpki", ] [[package]] @@ -1916,17 +1892,6 @@ dependencies = [ "syn 2.0.37", ] -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.9", - "tokio", - "webpki 0.22.2", -] - [[package]] name = "tokio-rustls" version = "0.24.1" @@ -2037,20 +2002,20 @@ dependencies = [ "glob", "http", "hyper", - "hyper-rustls 0.23.2", + "hyper-rustls", "opentelemetry", "opentelemetry-prometheus", "prometheus", "rcgen", "regex", "reqwest", - "rustls 0.20.9", + "rustls 0.21.7", "rustls-pemfile", "serde", "serde_json", "structopt", "tokio", - "tokio-rustls 0.23.4", + "tokio-rustls", "tokio-util", "tracing", "tracing-subscriber", @@ -2123,7 +2088,7 @@ dependencies = [ "qstring", "rustls 0.19.1", "url", - "webpki 0.21.4", + "webpki", "webpki-roots", ] @@ -2278,23 +2243,13 @@ dependencies = [ "untrusted", ] -[[package]] -name = "webpki" -version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "webpki-roots" version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" dependencies = [ - "webpki 0.21.4", + "webpki", ] [[package]] @@ -2415,18 +2370,18 @@ dependencies = [ [[package]] name = "zstd" -version = "0.11.2+zstd.1.5.2" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "6.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" dependencies = [ "libc", "zstd-sys", diff --git a/Cargo.toml b/Cargo.toml index afd4c0a..4ab4fb8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,19 +19,19 @@ serde_json = "1.0.89" tokio = { version = "1.22", default-features = false, features = ["rt", "rt-multi-thread", "io-util", "net", "time", "macros", "sync", "signal", "fs"] } bytes = "1" acme-micro = "0.12" -rustls = { version = "0.20", features = [ "dangerous_configuration" ] } +rustls = { version = "0.21", features = [ "dangerous_configuration" ] } rustls-pemfile = "1.0" chrono = { version = "0.4", features = [ "serde" ] } hyper = { version = "0.14", features = [ "full" ] } futures-util = "0.3" -tokio-rustls = "0.23" -hyper-rustls = "0.23" +tokio-rustls = "0.24" +hyper-rustls = "0.24" http = "0.2" structopt = "0.3" glob = "0.3" -rcgen = "0.10" +rcgen = "0.11" accept-encoding-fork = "0.2.0-alpha.3" -async-compression = { version = "0.3", features = ["tokio", "gzip", "zstd", "deflate", "brotli"] } +async-compression = { version = "0.4", features = ["tokio", "gzip", "zstd", "deflate", "brotli"] } tokio-util = { version = "0.7", features = ["io"] } uuid = { version = "1.2", features = ["v4"] } opentelemetry = "0.17"