Bump rustls-pemfile to 2.0.0

Cargo.toml

@@ -75,7 +75,7 @@ reedline = "0.27.1"
 reqwest = { version = "0.11", features = ["default", "blocking", "json", "stream"] }
 ringbuffer = "0.15.0"
 rusqlite = { version = "0.30" }
-rustls-pemfile = { version = "1.0.4" }
+rustls-pemfile = { version = "2.0.0" }
 schemars = { version = "0.8", features = [ "chrono", "uuid1" ] }
 serde = { version = "1", features = [ "derive" ] }
 serde_json = "1"

common/src/x509.rs

@@ -12,16 +12,18 @@ use tokio_rustls::rustls::{
 
 pub fn load_certs(path: &str) -> io::Result<Vec<Certificate>> {
     certs(&mut BufReader::new(File::open(path)?))
+        .map(|v| v.map(|c| Certificate(c.to_vec())))
+        .collect::<Result<Vec<Certificate>, _>>()
         .map_err(|_| {
             io::Error::new(io::ErrorKind::InvalidInput, "invalid cert")
         })
-        .map(|mut certs| certs.drain(..).map(Certificate).collect())
 }
 
 pub fn load_rsa_keys(path: &str) -> io::Result<Vec<PrivateKey>> {
     rsa_private_keys(&mut BufReader::new(File::open(path)?))
+        .map(|v| v.map(|c| PrivateKey(c.secret_pkcs1_der().to_owned())))
+        .collect::<Result<Vec<PrivateKey>, _>>()
         .map_err(|_| io::Error::new(io::ErrorKind::InvalidInput, "invalid key"))
-        .map(|mut keys| keys.drain(..).map(PrivateKey).collect())
 }
 
 #[derive(thiserror::Error, Debug)]