chore: update rustls-pemfile (#93)

* chore: update rustls-pemfile

Signed-off-by: gabrik <[email protected]>

* chore: fix clippy

Signed-off-by: gabrik <[email protected]>

* chore: sync Cargo.lock

Signed-off-by: gabrik <[email protected]>

---------

Signed-off-by: gabrik <[email protected]>

Author: gabrik

Cargo.lock

@@ -42,7 +42,8 @@ ntex-tls = "0.3.2"
 regex = "1.7.1"
 rustc_version = "0.4"
 rustls = "0.21.7"
-rustls-pemfile = "1.0.4"
+rustls-pemfile = "2.0.0"
+rustls-pki-types = "1.1.0"
 secrecy = { version = "0.8.0", features = ["alloc", "serde"] }
 serde = "1.0.154"
 serde_json = "1.0.94"

Cargo.toml

@@ -278,9 +278,15 @@ fn load_private_key(bytes: Vec<u8>) -> ZResult<PrivateKey> {
     loop {
         match rustls_pemfile::read_one(&mut reader) {
             Ok(item) => match item {
-                Some(rustls_pemfile::Item::RSAKey(key)) => return Ok(rustls::PrivateKey(key)),
-                Some(rustls_pemfile::Item::PKCS8Key(key)) => return Ok(rustls::PrivateKey(key)),
-                Some(rustls_pemfile::Item::ECKey(key)) => return Ok(rustls::PrivateKey(key)),
+                Some(rustls_pemfile::Item::Pkcs1Key(key)) => {
+                    return Ok(rustls::PrivateKey(key.secret_pkcs1_der().to_vec()))
+                }
+                Some(rustls_pemfile::Item::Pkcs8Key(key)) => {
+                    return Ok(rustls::PrivateKey(key.secret_pkcs8_der().to_vec()))
+                }
+                Some(rustls_pemfile::Item::Sec1Key(key)) => {
+                    return Ok(rustls::PrivateKey(key.secret_sec1_der().to_vec()))
+                }
                 None => break,
                 _ => continue,
             },
@@ -293,14 +299,14 @@ fn load_private_key(bytes: Vec<u8>) -> ZResult<PrivateKey> {
 fn load_certs(bytes: Vec<u8>) -> ZResult<Vec<Certificate>> {
     let mut reader = BufReader::new(bytes.as_slice());
 
-    let certs = match rustls_pemfile::certs(&mut reader) {
-        Ok(certs) => certs,
-        Err(e) => return Err(zerror!("Cannot parse certificate {e:?}").into()),
-    };
+    let certs: Vec<Certificate> = rustls_pemfile::certs(&mut reader)
+        .map(|c| c.map(|c| Certificate(c.to_vec())))
+        .collect::<Result<_, _>>()
+        .map_err(|err| zerror!("Error processing client certificate: {err}."))?;
 
     match certs.is_empty() {
         true => Err(zerror!("No certificates found").into()),
-        false => Ok(certs.iter().map(|c| Certificate(c.to_vec())).collect()),
+        false => Ok(certs),
     }
 }