Skip to content

Commit 6ce71e9

Browse files
tomasolpchickey
andauthored
Update tokio-rustls to 0.26.4, rustls to 0.23 (#12837)
* Update `tokio-rustls` to 0.26.4, `rustls` to 0.23 This updates `rustls-webpki` from 0.102.x, which is vulnerable to incorrect CRL distribution point matching (RUSTSEC-2026-0049), to 0.103.10. Uses `ring` as the crypto backend to preserve existing dependencies. * cargo vets for update to rustls We had previously exempted rustls, rustls-webpki, and tokio-rustls from vetting. The exempted versions have been updated. We were able to pull in a vet from mozilla for zeroize, which had previously been exempted. I audited the (small) diff from the imported audit version. --------- Co-authored-by: Pat Hickey <p.hickey@f5.com>
1 parent 58722d9 commit 6ce71e9

File tree

5 files changed

+38
-15
lines changed

5 files changed

+38
-15
lines changed

Cargo.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -426,8 +426,8 @@ libtest-mimic = "0.8.1"
426426
semver = { version = "1.0.27", default-features = false }
427427
ittapi = "0.4.0"
428428
libm = "0.2.16"
429-
tokio-rustls = "0.25.0"
430-
rustls = "0.22.0"
429+
tokio-rustls = { version = "0.26.4", default-features = false, features = ["ring", "tls12", "logging"] }
430+
rustls = { version = "0.23", default-features = false, features = ["ring", "tls12", "logging"] }
431431
tokio-native-tls = "0.3.1"
432432
native-tls = "0.2.11"
433433
tokio-openssl = "0.6.5"

supply-chain/audits.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6592,6 +6592,11 @@ who = "Nick Fitzgerald <fitzgen@gmail.com>"
65926592
criteria = "safe-to-deploy"
65936593
delta = "0.1.3 -> 0.1.5"
65946594

6595+
[[audits.zeroize]]
6596+
who = "Pat Hickey <p.hickey@f5.com>"
6597+
criteria = "safe-to-deploy"
6598+
delta = "1.8.1 -> 1.8.2"
6599+
65956600
[[audits.zstd]]
65966601
who = "Alex Crichton <alex@alexcrichton.com>"
65976602
criteria = "safe-to-deploy"

supply-chain/config.toml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,10 @@ criteria = "safe-to-deploy"
468468
version = "0.22.4"
469469
criteria = "safe-to-deploy"
470470

471+
[[exemptions.rustls]]
472+
version = "0.23.37"
473+
criteria = "safe-to-deploy"
474+
471475
[[exemptions.rustls-pki-types]]
472476
version = "1.3.1"
473477
criteria = "safe-to-deploy"
@@ -476,6 +480,10 @@ criteria = "safe-to-deploy"
476480
version = "0.102.2"
477481
criteria = "safe-to-deploy"
478482

483+
[[exemptions.rustls-webpki]]
484+
version = "0.103.10"
485+
criteria = "safe-to-deploy"
486+
479487
[[exemptions.rusty-fork]]
480488
version = "0.3.0"
481489
criteria = "safe-to-deploy"
@@ -528,6 +536,10 @@ criteria = "safe-to-deploy"
528536
version = "0.25.0"
529537
criteria = "safe-to-deploy"
530538

539+
[[exemptions.tokio-rustls]]
540+
version = "0.26.4"
541+
criteria = "safe-to-deploy"
542+
531543
[[exemptions.typenum]]
532544
version = "1.15.0"
533545
criteria = "safe-to-deploy"
@@ -564,10 +576,6 @@ criteria = "safe-to-deploy"
564576
version = "0.4.0"
565577
criteria = "safe-to-deploy"
566578

567-
[[exemptions.zeroize]]
568-
version = "1.7.0"
569-
criteria = "safe-to-deploy"
570-
571579
[[exemptions.zip]]
572580
version = "0.6.6"
573581
criteria = "safe-to-deploy"

supply-chain/imports.lock

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3697,6 +3697,16 @@ criteria = "safe-to-deploy"
36973697
version = "0.1.3"
36983698
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
36993699

3700+
[[audits.mozilla.audits.zeroize]]
3701+
who = "Benjamin Beurdouche <beurdouche@mozilla.com>"
3702+
criteria = "safe-to-deploy"
3703+
version = "1.8.1"
3704+
notes = """
3705+
This code DOES contain unsafe code required to internally call volatiles
3706+
for deleting data. This is expected and documented behavior.
3707+
"""
3708+
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
3709+
37003710
[[audits.mozilla.audits.zerovec]]
37013711
who = "Makoto Kato <m_kato@ga2.so-net.ne.jp>"
37023712
criteria = "safe-to-deploy"

0 commit comments

Comments
 (0)