From ea71de282d7e5137bf2da173ddf132c6f2365965 Mon Sep 17 00:00:00 2001
From: Daniel McCarney <daniel@binaryparadox.net>
Date: Tue, 1 Aug 2023 15:51:39 -0400
Subject: [PATCH] deps: update to webpki-roots 0.25, fix deprecations.

Updates the rustls project and rustls-examples project to use
webpki-roots 0.25.0 instead of 0.24.0, fixes associated deprecations.
---
 examples/Cargo.toml                    | 2 +-
 examples/src/bin/limitedclient.rs      | 1 -
 examples/src/bin/simple_0rtt_client.rs | 1 -
 examples/src/bin/simpleclient.rs       | 1 -
 examples/src/bin/tlsclient-mio.rs      | 1 -
 rustls/Cargo.toml                      | 2 +-
 rustls/src/lib.rs                      | 2 --
 rustls/src/verifybench.rs              | 1 -
 8 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/examples/Cargo.toml b/examples/Cargo.toml
index 3f4f7ddbd5..6f3f9b5ace 100644
--- a/examples/Cargo.toml
+++ b/examples/Cargo.toml
@@ -21,7 +21,7 @@ rustls-pemfile = "1.0.3"
 sct = "0.7"
 serde = "1.0"
 serde_derive = "1.0"
-webpki-roots = "0.24"
+webpki-roots = "0.25"
 
 [dev-dependencies]
 regex = "1.0"
diff --git a/examples/src/bin/limitedclient.rs b/examples/src/bin/limitedclient.rs
index 4c7ff5ff84..9992ca1f8c 100644
--- a/examples/src/bin/limitedclient.rs
+++ b/examples/src/bin/limitedclient.rs
@@ -12,7 +12,6 @@ fn main() {
     let mut root_store = rustls::RootCertStore::empty();
     root_store.add_trust_anchors(
         webpki_roots::TLS_SERVER_ROOTS
-            .0
             .iter()
             .map(|ta| {
                 OwnedTrustAnchor::from_subject_spki_name_constraints(
diff --git a/examples/src/bin/simple_0rtt_client.rs b/examples/src/bin/simple_0rtt_client.rs
index ae090a24b0..615053b7a3 100644
--- a/examples/src/bin/simple_0rtt_client.rs
+++ b/examples/src/bin/simple_0rtt_client.rs
@@ -60,7 +60,6 @@ fn main() {
     let mut root_store = RootCertStore::empty();
     root_store.add_trust_anchors(
         webpki_roots::TLS_SERVER_ROOTS
-            .0
             .iter()
             .map(|ta| {
                 OwnedTrustAnchor::from_subject_spki_name_constraints(
diff --git a/examples/src/bin/simpleclient.rs b/examples/src/bin/simpleclient.rs
index e1ea0dda73..ffed4081e6 100644
--- a/examples/src/bin/simpleclient.rs
+++ b/examples/src/bin/simpleclient.rs
@@ -18,7 +18,6 @@ fn main() {
     let mut root_store = RootCertStore::empty();
     root_store.add_trust_anchors(
         webpki_roots::TLS_SERVER_ROOTS
-            .0
             .iter()
             .map(|ta| {
                 OwnedTrustAnchor::from_subject_spki_name_constraints(
diff --git a/examples/src/bin/tlsclient-mio.rs b/examples/src/bin/tlsclient-mio.rs
index ea21360be5..345b377c0c 100644
--- a/examples/src/bin/tlsclient-mio.rs
+++ b/examples/src/bin/tlsclient-mio.rs
@@ -381,7 +381,6 @@ fn make_config(args: &Args) -> Arc<rustls::ClientConfig> {
     } else {
         root_store.add_trust_anchors(
             webpki_roots::TLS_SERVER_ROOTS
-                .0
                 .iter()
                 .map(|ta| {
                     OwnedTrustAnchor::from_subject_spki_name_constraints(
diff --git a/rustls/Cargo.toml b/rustls/Cargo.toml
index 971e32ab6b..6b2ec13a40 100644
--- a/rustls/Cargo.toml
+++ b/rustls/Cargo.toml
@@ -34,7 +34,7 @@ read_buf = ["rustversion"]
 bencher = "0.1.5"
 env_logger = "0.10"
 log = "0.4.4"
-webpki-roots = "0.24.0"
+webpki-roots = "0.25.0"
 rustls-pemfile = "1.0.3"
 base64 = "0.21"
 
diff --git a/rustls/src/lib.rs b/rustls/src/lib.rs
index cb87c5e2a4..ebd70070e9 100644
--- a/rustls/src/lib.rs
+++ b/rustls/src/lib.rs
@@ -107,7 +107,6 @@
 //! let mut root_store = rustls::RootCertStore::empty();
 //! root_store.add_trust_anchors(
 //!     webpki_roots::TLS_SERVER_ROOTS
-//!         .0
 //!         .iter()
 //!         .map(|ta| {
 //!             rustls::OwnedTrustAnchor::from_subject_spki_name_constraints(
@@ -140,7 +139,6 @@
 //! # let mut root_store = rustls::RootCertStore::empty();
 //! # root_store.add_trust_anchors(
 //! #  webpki_roots::TLS_SERVER_ROOTS
-//! #      .0
 //! #      .iter()
 //! #      .map(|ta| {
 //! #          rustls::OwnedTrustAnchor::from_subject_spki_name_constraints(
diff --git a/rustls/src/verifybench.rs b/rustls/src/verifybench.rs
index bc1d7b5967..793a84fb2b 100644
--- a/rustls/src/verifybench.rs
+++ b/rustls/src/verifybench.rs
@@ -189,7 +189,6 @@ impl Context {
         let mut roots = anchors::RootCertStore::empty();
         roots.add_trust_anchors(
             webpki_roots::TLS_SERVER_ROOTS
-                .0
                 .iter()
                 .map(|ta| {
                     OwnedTrustAnchor::from_subject_spki_name_constraints(