From d918ef14951eedb211e82c095c9d792ec94702c1 Mon Sep 17 00:00:00 2001 From: asonix Date: Tue, 9 Jul 2024 16:24:44 -0500 Subject: [PATCH] Update rustls --- Cargo.lock | 21 +++++++++++---------- Cargo.toml | 8 ++++---- src/main.rs | 2 +- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5c521a5..4e19b79 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -170,7 +170,7 @@ dependencies = [ "pin-project-lite", "rustls-pki-types", "tokio", - "tokio-rustls 0.25.0", + "tokio-rustls 0.26.0", "tokio-util", "tracing", ] @@ -423,7 +423,7 @@ dependencies = [ "rsa", "rsa-magic-public-key", "ructe", - "rustls 0.22.4", + "rustls 0.23.11", "rustls-channel-resolver", "rustls-pemfile 2.1.2", "serde", @@ -3304,11 +3304,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0" dependencies = [ "log", + "once_cell", "ring", "rustls-pki-types", "rustls-webpki 0.102.5", @@ -3318,12 +3319,12 @@ dependencies = [ [[package]] name = "rustls-channel-resolver" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbd1941204442f051576a9a7ea8e8db074ad7fd43db1eb3378c3633f9f9e166" +checksum = "fede2a247359da6b4998f7723ec6468c2d6a577a5d8c17e54f21806426ad2290" dependencies = [ "nanorand", - "rustls 0.22.4", + "rustls 0.23.11", ] [[package]] @@ -3944,11 +3945,11 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.22.4", + "rustls 0.23.11", "rustls-pki-types", "tokio", ] diff --git a/Cargo.toml b/Cargo.toml index 90b770c..80d243d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ default = [] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -actix-web = { version = "4.4.0", default-features = false, features = ["compress-brotli", "compress-gzip", "rustls-0_22"] } +actix-web = { version = "4.4.0", default-features = false, features = ["compress-brotli", "compress-gzip", "rustls-0_23"] } actix-webfinger = { version = "0.5.0", default-features = false } activitystreams = "0.7.0-alpha.25" activitystreams-ext = "0.1.0-alpha.3" @@ -54,14 +54,14 @@ pin-project-lite = "0.2.9" # pinned to metrics-util quanta = "0.12.0" rand = "0.8" -reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "stream"]} +reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "stream"] } reqwest-middleware = "0.2" reqwest-tracing = "0.4.5" ring = "0.17.5" rsa = "0.9" rsa-magic-public-key = "0.8.0" -rustls = "0.22.0" -rustls-channel-resolver = "0.2.0" +rustls = { version = "0.23.0", default-features = false, features = ["ring", "logging", "std", "tls12"] } +rustls-channel-resolver = "0.3.0" rustls-pemfile = "2" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/main.rs b/src/main.rs index a871f0a..44c53ec 100644 --- a/src/main.rs +++ b/src/main.rs @@ -418,7 +418,7 @@ async fn server_main( .with_no_client_auth() .with_cert_resolver(cert_rx); server - .bind_rustls_0_22(bind_address, server_config)? + .bind_rustls_0_23(bind_address, server_config)? .run() .await?;