Skip to content

A lightweight WebAssembly runtime that is fast, secure, and standards-compliant

Update `tokio-rustls` to 0.26.4, `rustls` to 0.23 (#12837)

Tomáš Olvecký6ce71e924758
diff --git a/Cargo.lock b/Cargo.lock
index f874dee918..51144493fa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3233,11 +3233,12 @@ dependencies = [
[[package]]
name = "rustls"
-version = "0.22.4"
+version = "0.23.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
+checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4"
dependencies = [
"log",
+ "once_cell",
"ring",
"rustls-pki-types",
"rustls-webpki",
@@ -3256,9 +3257,9 @@ dependencies = [
[[package]]
name = "rustls-webpki"
-version = "0.102.2"
+version = "0.103.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610"
+checksum = "df33b2b81ac578cabaf06b89b0631153a3f416b0a886e8a7a1707fb51abbd1ef"
dependencies = [
"ring",
"rustls-pki-types",
@@ -3919,12 +3920,11 @@ dependencies = [
[[package]]
name = "tokio-rustls"
-version = "0.25.0"
+version = "0.26.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
+checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
dependencies = [
"rustls",
- "rustls-pki-types",
"tokio",
]
@@ -5962,9 +5962,9 @@ dependencies = [
[[package]]
name = "zeroize"
-version = "1.7.0"
+version = "1.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
[[package]]
name = "zerovec"
diff --git a/Cargo.toml b/Cargo.toml
index 3feafc5f9b..c5bf9a3e01 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -426,8 +426,8 @@ libtest-mimic = "0.8.1"
semver = { version = "1.0.27", default-features = false }
ittapi = "0.4.0"
libm = "0.2.16"
-tokio-rustls = "0.25.0"
-rustls = "0.22.0"
+tokio-rustls = { version = "0.26.4", default-features = false, features = ["ring", "tls12", "logging"] }
+rustls = { version = "0.23", default-features = false, features = ["ring", "tls12", "logging"] }
tokio-native-tls = "0.3.1"
native-tls = "0.2.11"
tokio-openssl = "0.6.5"
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
index de2720982d..03bad6174c 100644
--- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml
@@ -6592,6 +6592,11 @@ who = "Nick Fitzgerald <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.1.3 -> 0.1.5"
+[[audits.zeroize]]
+who = "Pat Hickey <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "1.8.1 -> 1.8.2"
+
[[audits.zstd]]
who = "Alex Crichton <[email protected]>"
criteria = "safe-to-deploy"
diff --git a/supply-chain/config.toml b/supply-chain/config.toml
index d87bea5a59..1fada627e4 100644
--- a/supply-chain/config.toml
+++ b/supply-chain/config.toml
@@ -468,6 +468,10 @@ criteria = "safe-to-deploy"
version = "0.22.4"
criteria = "safe-to-deploy"
+[[exemptions.rustls]]
+version = "0.23.37"
+criteria = "safe-to-deploy"
+
[[exemptions.rustls-pki-types]]
version = "1.3.1"
criteria = "safe-to-deploy"
@@ -476,6 +480,10 @@ criteria = "safe-to-deploy"
version = "0.102.2"
criteria = "safe-to-deploy"
+[[exemptions.rustls-webpki]]
+version = "0.103.10"
+criteria = "safe-to-deploy"
+
[[exemptions.rusty-fork]]
version = "0.3.0"
criteria = "safe-to-deploy"
@@ -528,6 +536,10 @@ criteria = "safe-to-deploy"
version = "0.25.0"
criteria = "safe-to-deploy"
+[[exemptions.tokio-rustls]]
+version = "0.26.4"
+criteria = "safe-to-deploy"
+
[[exemptions.typenum]]
version = "1.15.0"
criteria = "safe-to-deploy"
@@ -564,10 +576,6 @@ criteria = "safe-to-deploy"
version = "0.4.0"
criteria = "safe-to-deploy"
-[[exemptions.zeroize]]
-version = "1.7.0"
-criteria = "safe-to-deploy"
-
[[exemptions.zip]]
version = "0.6.6"
criteria = "safe-to-deploy"
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index e45e1d2c1d..6428023123 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -3697,6 +3697,16 @@ criteria = "safe-to-deploy"
version = "0.1.3"
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
+[[audits.mozilla.audits.zeroize]]
+who = "Benjamin Beurdouche <[email protected]>"
+criteria = "safe-to-deploy"
+version = "1.8.1"
+notes = """
+This code DOES contain unsafe code required to internally call volatiles
+for deleting data. This is expected and documented behavior.
+"""
+aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
+
[[audits.mozilla.audits.zerovec]]
who = "Makoto Kato <[email protected]>"
criteria = "safe-to-deploy"