feat: parse pem certificates

Author: LeoBorai

Cargo.lock

@@ -43,7 +43,7 @@ hyper-rustls = { version = "0.23.0", features = ["webpki-roots"] }
 local-ip-address = "0.4.4"
 mime_guess = "2.0.4"
 rustls = "0.20.4"
-rustls-pemfile = "0.3.0"
+rustls-pemfile = "1.0.0"
 termcolor = "1.1.3"
 tokio = { version = "1.18.2", features = ["fs", "rt-multi-thread", "signal", "macros"] }
 tokio-rustls = "0.23.4"

Cargo.toml

@@ -1,10 +1,12 @@
 use anyhow::{ensure, Context, Error, Result};
-use rustls::internal::msgs::codec::{Codec, Reader};
+use rustls::internal::msgs::codec::Codec;
+use rustls::Reader;
 use rustls::{Certificate, PrivateKey};
-use rustls_pemfile::{pkcs8_private_keys, rsa_private_keys};
+use rustls_pemfile::{pkcs8_private_keys, rsa_private_keys, Item};
 use serde::Deserialize;
 use std::fs::File;
-use std::io::{BufRead, BufReader};
+use std::io::{BufRead, BufReader, Read};
+use std::iter;
 use std::path::Path;
 use std::str::FromStr;
 
@@ -36,19 +38,10 @@ pub fn load_cert(path: &Path) -> Result<Vec<Certificate>> {
         path.to_str().unwrap()
     ))?;
     let mut buf_reader = BufReader::new(file);
-    let bytes = buf_reader
-        .fill_buf()
-        .context("Failed to read cerficate bytes.")?;
+    let cert_bytes = &rustls_pemfile::certs(&mut buf_reader).unwrap()[0];
 
-    ensure!(bytes.is_empty(), "The provided certificate is empty");
-
-    let mut reader = Reader::init(bytes);
-
-    if let Some(cert) = Certificate::read(&mut reader) {
-        return Ok(vec![cert]);
-    }
-
-    Err(Error::msg("Failed to read certificate"))
+    ensure!(cert_bytes.len() > 0, "Empty certificate");
+    Ok(vec![Certificate(cert_bytes.to_vec())])
 }
 
 pub fn load_private_key(path: &Path, kind: &PrivateKeyAlgorithm) -> Result<PrivateKey> {