chore: update rustls-pemfile usage

omjadas · Dec 1, 2023 · 33a7fea · 33a7fea
1 parent 6fb41a4
commit 33a7fea
Show file tree

Hide file tree

Showing 10 changed files with 77 additions and 21 deletions.
diff --git a/benches/certificate_authorities.rs b/benches/certificate_authorities.rs
@@ -18,13 +18,18 @@ fn build_rcgen_ca(cache_size: u64) -> RcgenAuthority {
     let mut ca_cert_bytes: &[u8] = include_bytes!("../examples/ca/hudsucker.cer");
     let private_key = rustls::PrivateKey(
         pemfile::pkcs8_private_keys(&mut private_key_bytes)
+            .next()
+            .unwrap()
             .expect("Failed to parse private key")
-            .remove(0),
+            .secret_pkcs8_der()
+            .to_vec(),
     );
     let ca_cert = rustls::Certificate(
         pemfile::certs(&mut ca_cert_bytes)
+            .next()
+            .unwrap()
             .expect("Failed to parse CA certificate")
-            .remove(0),
+            .to_vec(),
     );
 
     RcgenAuthority::new(private_key, ca_cert, cache_size)

diff --git a/benches/proxy.rs b/benches/proxy.rs
@@ -31,13 +31,18 @@ fn build_ca() -> RcgenAuthority {
     let mut ca_cert_bytes: &[u8] = include_bytes!("../examples/ca/hudsucker.cer");
     let private_key = rustls::PrivateKey(
         pemfile::pkcs8_private_keys(&mut private_key_bytes)
+            .next()
+            .unwrap()
             .expect("Failed to parse private key")
-            .remove(0),
+            .secret_pkcs8_der()
+            .to_vec(),
     );
     let ca_cert = rustls::Certificate(
         pemfile::certs(&mut ca_cert_bytes)
+            .next()
+            .unwrap()
             .expect("Failed to parse CA certificate")
-            .remove(0),
+            .to_vec(),
     );
 
     RcgenAuthority::new(private_key, ca_cert, 1_000)

diff --git a/examples/log.rs b/examples/log.rs
@@ -51,13 +51,18 @@ async fn main() {
     let mut ca_cert_bytes: &[u8] = include_bytes!("ca/hudsucker.cer");
     let private_key = rustls::PrivateKey(
         pemfile::pkcs8_private_keys(&mut private_key_bytes)
+            .next()
+            .unwrap()
             .expect("Failed to parse private key")
-            .remove(0),
+            .secret_pkcs8_der()
+            .to_vec(),
     );
     let ca_cert = rustls::Certificate(
         pemfile::certs(&mut ca_cert_bytes)
+            .next()
+            .unwrap()
             .expect("Failed to parse CA certificate")
-            .remove(0),
+            .to_vec(),
     );
 
     let ca = RcgenAuthority::new(private_key, ca_cert, 1_000)

diff --git a/examples/noop.rs b/examples/noop.rs
@@ -17,13 +17,18 @@ async fn main() {
     let mut ca_cert_bytes: &[u8] = include_bytes!("ca/hudsucker.cer");
     let private_key = rustls::PrivateKey(
         pemfile::pkcs8_private_keys(&mut private_key_bytes)
+            .next()
+            .unwrap()
             .expect("Failed to parse private key")
-            .remove(0),
+            .secret_pkcs8_der()
+            .to_vec(),
     );
     let ca_cert = rustls::Certificate(
         pemfile::certs(&mut ca_cert_bytes)
+            .next()
+            .unwrap()
             .expect("Failed to parse CA certificate")
-            .remove(0),
+            .to_vec(),
     );
 
     let ca = RcgenAuthority::new(private_key, ca_cert, 1_000)

diff --git a/src/certificate_authority/rcgen_authority.rs b/src/certificate_authority/rcgen_authority.rs
@@ -28,13 +28,18 @@ use tracing::debug;
 /// let mut ca_cert_bytes: &[u8] = include_bytes!("../../examples/ca/hudsucker.cer");
 /// let private_key = rustls::PrivateKey(
 ///     pemfile::pkcs8_private_keys(&mut private_key_bytes)
+///         .next()
 ///         .unwrap()
-///         .remove(0),
+///         .expect("Failed to parse private key")
+///         .secret_pkcs8_der()
+///         .to_vec(),
 /// );
 /// let ca_cert = rustls::Certificate(
 ///     pemfile::certs(&mut ca_cert_bytes)
+///         .next()
 ///         .unwrap()
-///         .remove(0),
+///         .expect("Failed to parse CA certificate")
+///         .to_vec(),
 /// );
 ///
 /// let ca = RcgenAuthority::new(private_key, ca_cert, 1_000).unwrap();
@@ -159,13 +164,18 @@ mod tests {
         let mut ca_cert_bytes: &[u8] = include_bytes!("../../examples/ca/hudsucker.cer");
         let private_key = rustls::PrivateKey(
             pemfile::pkcs8_private_keys(&mut private_key_bytes)
+                .next()
+                .unwrap()
                 .expect("Failed to parse private key")
-                .remove(0),
+                .secret_pkcs8_der()
+                .to_vec(),
         );
         let ca_cert = rustls::Certificate(
             pemfile::certs(&mut ca_cert_bytes)
+                .next()
+                .unwrap()
                 .expect("Failed to parse CA certificate")
-                .remove(0),
+                .to_vec(),
         );
 
         RcgenAuthority::new(private_key, ca_cert, cache_size).unwrap()

diff --git a/src/proxy/builder.rs b/src/proxy/builder.rs
@@ -31,13 +31,18 @@ use tokio_tungstenite::Connector;
 /// # let mut ca_cert_bytes: &[u8] = include_bytes!("../../examples/ca/hudsucker.cer");
 /// # let private_key = rustls::PrivateKey(
 /// #     pemfile::pkcs8_private_keys(&mut private_key_bytes)
+/// #         .next()
+/// #         .unwrap()
 /// #         .expect("Failed to parse private key")
-/// #         .remove(0),
+/// #         .secret_pkcs8_der()
+/// #         .to_vec(),
 /// # );
 /// # let ca_cert = rustls::Certificate(
 /// #     pemfile::certs(&mut ca_cert_bytes)
+/// #         .next()
+/// #         .unwrap()
 /// #         .expect("Failed to parse CA certificate")
-/// #         .remove(0),
+/// #         .to_vec(),
 /// # );
 /// #
 /// # let ca = RcgenAuthority::new(private_key, ca_cert, 1_000)

diff --git a/src/proxy/mod.rs b/src/proxy/mod.rs
@@ -34,13 +34,18 @@ pub use builder::ProxyBuilder;
 /// # let mut ca_cert_bytes: &[u8] = include_bytes!("../../examples/ca/hudsucker.cer");
 /// # let private_key = rustls::PrivateKey(
 /// #     pemfile::pkcs8_private_keys(&mut private_key_bytes)
+/// #         .next()
+/// #         .unwrap()
 /// #         .expect("Failed to parse private key")
-/// #         .remove(0),
+/// #         .secret_pkcs8_der()
+/// #         .to_vec(),
 /// # );
 /// # let ca_cert = rustls::Certificate(
 /// #     pemfile::certs(&mut ca_cert_bytes)
+/// #         .next()
+/// #         .unwrap()
 /// #         .expect("Failed to parse CA certificate")
-/// #         .remove(0),
+/// #         .to_vec(),
 /// # );
 /// #
 /// # let ca = RcgenAuthority::new(private_key, ca_cert, 1_000)

diff --git a/tests/common/mod.rs b/tests/common/mod.rs
@@ -130,7 +130,13 @@ fn rustls_client_config() -> rustls::ClientConfig {
     }
 
     let mut ca_cert_bytes: &[u8] = include_bytes!("../../examples/ca/hudsucker.cer");
-    let ca_cert = rustls::Certificate(pemfile::certs(&mut ca_cert_bytes).unwrap().remove(0));
+    let ca_cert = rustls::Certificate(
+        pemfile::certs(&mut ca_cert_bytes)
+            .next()
+            .unwrap()
+            .expect("Failed to parse CA certificate")
+            .to_vec(),
+    );
 
     roots.add(&ca_cert).unwrap();
 

diff --git a/tests/rcgen_ca.rs b/tests/rcgen_ca.rs
@@ -9,13 +9,18 @@ fn build_ca() -> RcgenAuthority {
     let mut ca_cert_bytes: &[u8] = include_bytes!("../examples/ca/hudsucker.cer");
     let private_key = rustls::PrivateKey(
         pemfile::pkcs8_private_keys(&mut private_key_bytes)
+            .next()
+            .unwrap()
             .expect("Failed to parse private key")
-            .remove(0),
+            .secret_pkcs8_der()
+            .to_vec(),
     );
     let ca_cert = rustls::Certificate(
         pemfile::certs(&mut ca_cert_bytes)
+            .next()
+            .unwrap()
             .expect("Failed to parse CA certificate")
-            .remove(0),
+            .to_vec(),
     );
 
     RcgenAuthority::new(private_key, ca_cert, 1_000)

diff --git a/tests/websocket.rs b/tests/websocket.rs
@@ -15,13 +15,18 @@ fn build_ca() -> RcgenAuthority {
     let mut ca_cert_bytes: &[u8] = include_bytes!("../examples/ca/hudsucker.cer");
     let private_key = rustls::PrivateKey(
         pemfile::pkcs8_private_keys(&mut private_key_bytes)
+            .next()
+            .unwrap()
             .expect("Failed to parse private key")
-            .remove(0),
+            .secret_pkcs8_der()
+            .to_vec(),
     );
     let ca_cert = rustls::Certificate(
         pemfile::certs(&mut ca_cert_bytes)
+            .next()
+            .unwrap()
             .expect("Failed to parse CA certificate")
-            .remove(0),
+            .to_vec(),
     );
 
     RcgenAuthority::new(private_key, ca_cert, 1_000)