From 6e0559e68754d59a81beff92ff4538f617b8666c Mon Sep 17 00:00:00 2001
From: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com>
Date: Tue, 12 Nov 2024 01:55:43 +0900
Subject: [PATCH] Update low-level-rustls example (#3013)

Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com>
---
 examples/low-level-rustls/Cargo.toml  |  3 +--
 examples/low-level-rustls/src/main.rs | 16 +++++-----------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/examples/low-level-rustls/Cargo.toml b/examples/low-level-rustls/Cargo.toml
index 1eaf04b3..eace54a8 100644
--- a/examples/low-level-rustls/Cargo.toml
+++ b/examples/low-level-rustls/Cargo.toml
@@ -9,9 +9,8 @@ axum = { path = "../../axum" }
 futures-util = { version = "0.3", default-features = false }
 hyper = { version = "1.0.0", features = ["full"] }
 hyper-util = { version = "0.1" }
-rustls-pemfile = "1.0.4"
 tokio = { version = "1", features = ["full"] }
-tokio-rustls = "0.24.1"
+tokio-rustls = "0.26"
 tower-service = "0.3.2"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/examples/low-level-rustls/src/main.rs b/examples/low-level-rustls/src/main.rs
index 7f5c994e..d0627ed8 100644
--- a/examples/low-level-rustls/src/main.rs
+++ b/examples/low-level-rustls/src/main.rs
@@ -8,16 +8,14 @@ use axum::{extract::Request, routing::get, Router};
 use futures_util::pin_mut;
 use hyper::body::Incoming;
 use hyper_util::rt::{TokioExecutor, TokioIo};
-use rustls_pemfile::{certs, pkcs8_private_keys};
 use std::{
-    fs::File,
-    io::BufReader,
     path::{Path, PathBuf},
     sync::Arc,
 };
 use tokio::net::TcpListener;
 use tokio_rustls::{
-    rustls::{Certificate, PrivateKey, ServerConfig},
+    rustls::pki_types::{pem::PemObject, CertificateDer, PrivateKeyDer},
+    rustls::ServerConfig,
     TlsAcceptor,
 };
 use tower_service::Service;
@@ -95,18 +93,14 @@ async fn handler() -> &'static str {
 }
 
 fn rustls_server_config(key: impl AsRef<Path>, cert: impl AsRef<Path>) -> Arc<ServerConfig> {
-    let mut key_reader = BufReader::new(File::open(key).unwrap());
-    let mut cert_reader = BufReader::new(File::open(cert).unwrap());
+    let key = PrivateKeyDer::from_pem_file(key).unwrap();
 
-    let key = PrivateKey(pkcs8_private_keys(&mut key_reader).unwrap().remove(0));
-    let certs = certs(&mut cert_reader)
+    let certs = CertificateDer::pem_file_iter(cert)
         .unwrap()
-        .into_iter()
-        .map(Certificate)
+        .map(|cert| cert.unwrap())
         .collect();
 
     let mut config = ServerConfig::builder()
-        .with_safe_defaults()
         .with_no_client_auth()
         .with_single_cert(certs, key)
         .expect("bad certificate/key");