Merge pull request #1516 from zancas/bump_pemfile

Bump pemfile

Cargo.toml

@@ -74,7 +74,7 @@ reqwest = "0.12"
 ring = "0.17.0"
 rust-embed = "6.3.0"
 rustls = { version = "0.23.13", features = ["ring"] }
-rustls-pemfile = "1.0.0"
+rustls-pemfile = "2"
 rustyline = "11.0.0"
 secp256k1 = "=0.27.0"
 secrecy = "0.8.0"

zingo-netutils/Cargo.toml

@@ -12,7 +12,6 @@ hyper-rustls.workspace = true
 hyper-util.workspace = true
 hyper.workspace = true
 prost.workspace = true
-rustls-pemfile.workspace = true
 thiserror.workspace = true
 tokio-rustls.workspace = true
 tonic.workspace = true
@@ -22,3 +21,6 @@ zcash_client_backend.workspace = true
 
 [features]
 test-features = []
+
+[dev-dependencies]
+rustls-pemfile.workspace = true

zingo-netutils/src/lib.rs

@@ -182,7 +182,9 @@ fn add_test_cert_to_roots(roots: &mut RootCertStore) {
     const TEST_PEMFILE_PATH: &str = "test-data/localhost.pem";
     let fd = std::fs::File::open(TEST_PEMFILE_PATH).unwrap();
     let mut buf = std::io::BufReader::new(&fd);
-    let certs_bytes = rustls_pemfile::certs(&mut buf).unwrap();
+    let certs_bytes: Vec<tonic::transport::CertificateDer> = rustls_pemfile::certs(&mut buf)
+        .filter_map(Result::ok)
+        .collect();
     let certs: Vec<CertificateDer<'_>> =
         certs_bytes.into_iter().map(CertificateDer::from).collect();