ci-bench: use pki-types pem decoder

4 files changed, 13 insertions, 19 deletions

diff --git a/Cargo.lock b/Cargo.lock
index b481cf6e..439d7e1d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2153,7 +2153,6 @@ dependencies = [
  "itertools 0.13.0",
  "rayon",
  "rustls 0.23.13",
- "rustls-pemfile",
  "rustls-pki-types",
  "tikv-jemallocator",
 ]
diff --git a/ci-bench/Cargo.toml b/ci-bench/Cargo.toml
index 51b70528..51dfefd0 100644
--- a/ci-bench/Cargo.toml
+++ b/ci-bench/Cargo.toml
@@ -13,10 +13,9 @@ byteorder = "1.4.3"
 clap = { version = "4.3.21", features = ["derive"] }
 fxhash = "0.2.1"
 itertools = "0.13"
-pki-types = { package = "rustls-pki-types", version = "1.4.1" }
+pki-types = { package = "rustls-pki-types", version = "1.9" }
 rayon = "1.7.0"
 rustls = { path = "../rustls", features = ["ring", "aws_lc_rs"] }
-rustls-pemfile = "2"
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
 tikv-jemallocator = "0.6"
diff --git a/ci-bench/src/main.rs b/ci-bench/src/main.rs
index dcd879f6..fd27a77c 100644
--- a/ci-bench/src/main.rs
+++ b/ci-bench/src/main.rs
@@ -1,5 +1,5 @@
 use std::collections::HashMap;
-use std::fs::{self, File};
+use std::fs::File;
 use std::hint::black_box;
 use std::io::{self, BufRead, BufReader, Write};
 use std::mem;
@@ -17,6 +17,8 @@ use rayon::iter::Either;
 use rayon::prelude::*;
 use rustls::client::Resumption;
 use rustls::crypto::{aws_lc_rs, ring, CryptoProvider, GetRandomFailed, SecureRandom};
+use rustls::pki_types::pem::PemObject;
+use rustls::pki_types::CertificateDer;
 use rustls::server::{NoServerSessionStorage, ServerSessionMemoryCache, WebPkiClientVerifier};
 use rustls::{
     CipherSuite, ClientConfig, ClientConnection, HandshakeKind, ProtocolVersion, RootCertStore,
@@ -502,10 +504,10 @@ impl ClientSideStepper<'_> {
     fn make_config(params: &BenchmarkParams, resume: ResumptionKind) -> Arc<ClientConfig> {
         assert_eq!(params.ciphersuite.version(), params.version);
         let mut root_store = RootCertStore::empty();
-        let mut rootbuf =
-            io::BufReader::new(fs::File::open(params.key_type.path_for("ca.cert")).unwrap());
         root_store.add_parsable_certificates(
-            rustls_pemfile::certs(&mut rootbuf).map(|result| result.unwrap()),
+            CertificateDer::pem_file_iter(params.key_type.path_for("ca.cert"))
+                .unwrap()
+                .map(|result| result.unwrap()),
         );
 
         let mut cfg = ClientConfig::builder_with_provider(
diff --git a/ci-bench/src/util.rs b/ci-bench/src/util.rs
index cd67878b..2702b4a2 100644
--- a/ci-bench/src/util.rs
+++ b/ci-bench/src/util.rs
@@ -1,5 +1,4 @@
-use std::{fs, io};
-
+use rustls::pki_types::pem::PemObject;
 use rustls::pki_types::{CertificateDer, PrivateKeyDer};
 
 #[derive(PartialEq, Clone, Copy, Debug)]
@@ -19,19 +18,14 @@ impl KeyType {
     }
 
     pub(crate) fn get_chain(&self) -> Vec<CertificateDer<'static>> {
-        rustls_pemfile::certs(&mut io::BufReader::new(
-            fs::File::open(self.path_for("end.fullchain")).unwrap(),
-        ))
-        .map(|result| result.unwrap())
-        .collect()
+        CertificateDer::pem_file_iter(self.path_for("end.fullchain"))
+            .unwrap()
+            .map(|result| result.unwrap())
+            .collect()
     }
 
     pub(crate) fn get_key(&self) -> PrivateKeyDer<'static> {
-        rustls_pemfile::private_key(&mut io::BufReader::new(
-            fs::File::open(self.path_for("end.key")).unwrap(),
-        ))
-        .unwrap()
-        .unwrap()
+        PrivateKeyDer::from_pem_file(self.path_for("end.key")).unwrap()
     }
 }