From 01c0a930e034d187a2a98b4c04809cfab4c301dc Mon Sep 17 00:00:00 2001 From: Daniel McCarney Date: Wed, 30 Jul 2025 09:54:12 -0400 Subject: [PATCH 1/2] librustls: update rustls 0.23.29 -> 0.23.31 There were no upstream changes that motivate API updates in this crate. --- Cargo.lock | 4 ++-- librustls/Cargo.toml | 2 +- librustls/build.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 392e3c64..5cf5224b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1186,9 +1186,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.30" +version = "0.23.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069a8df149a16b1a12dcc31497c3396a173844be3cac4bd40c9e7671fef96671" +checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc" dependencies = [ "aws-lc-rs", "brotli", diff --git a/librustls/Cargo.toml b/librustls/Cargo.toml index 835711d0..d1f161f5 100644 --- a/librustls/Cargo.toml +++ b/librustls/Cargo.toml @@ -30,7 +30,7 @@ prefer-post-quantum = ["aws-lc-rs", "rustls/prefer-post-quantum"] [dependencies] # Keep in sync with RUSTLS_CRATE_VERSION in build.rs -rustls = { version = "0.23.29", default-features = false, features = ["std", "tls12"] } +rustls = { version = "0.23.31", default-features = false, features = ["std", "tls12"] } webpki = { workspace = true } libc = { workspace = true } log = { workspace = true } diff --git a/librustls/build.rs b/librustls/build.rs index f9c1f1fe..1939b2f7 100644 --- a/librustls/build.rs +++ b/librustls/build.rs @@ -8,7 +8,7 @@ use std::{env, fs, path::PathBuf}; // because doing so would require a heavy-weight deserialization lib dependency // (and it couldn't be a _dev_ dep for use in a build script) or doing brittle // by-hand parsing. -const RUSTLS_CRATE_VERSION: &str = "0.23.29"; +const RUSTLS_CRATE_VERSION: &str = "0.23.31"; fn main() { let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap()); From 5c8b5b3dbb617d4830edf2008ddf3cdfcf90a6c1 Mon Sep 17 00:00:00 2001 From: Daniel McCarney Date: Wed, 30 Jul 2025 10:41:03 -0400 Subject: [PATCH 2/2] librustls: use '=' prefix specifier for rustls dep and, in the `rustls_version_match()` test, ignore that prefix when comparing the version. --- librustls/Cargo.toml | 2 +- librustls/tests/rustls_version.rs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/librustls/Cargo.toml b/librustls/Cargo.toml index d1f161f5..91890158 100644 --- a/librustls/Cargo.toml +++ b/librustls/Cargo.toml @@ -30,7 +30,7 @@ prefer-post-quantum = ["aws-lc-rs", "rustls/prefer-post-quantum"] [dependencies] # Keep in sync with RUSTLS_CRATE_VERSION in build.rs -rustls = { version = "0.23.31", default-features = false, features = ["std", "tls12"] } +rustls = { version = "=0.23.31", default-features = false, features = ["std", "tls12"] } webpki = { workspace = true } libc = { workspace = true } log = { workspace = true } diff --git a/librustls/tests/rustls_version.rs b/librustls/tests/rustls_version.rs index b4c1bd9e..8e00203d 100644 --- a/librustls/tests/rustls_version.rs +++ b/librustls/tests/rustls_version.rs @@ -51,7 +51,8 @@ fn rustls_version_match() { // Handle the `rustls = "x.y.z"` case None => rustls_dep.as_str(), } - .expect("missing rustls dependency version"); + .expect("missing rustls dependency version") + .trim_start_matches("="); // Assert that rustls_version() returns a string of the form: // $CRATE_NAME/$CRATE_VERSION/rustls/$RUSTLS_VERSION