Update rustls-pemfile to 2.0.0

PyO3 · Dec 2, 2023 · c43a4ea · c43a4ea
1 parent e45591a
commit c43a4ea
Show file tree

Hide file tree

Showing 3 changed files with 113 additions and 39 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -82,7 +82,7 @@ clap_complete_command = { version = "0.5.1", optional = true }
 
 # cross compile
 cargo-zigbuild = { version = "0.18.0", default-features = false, optional = true }
-cargo-xwin = { version = "0.16.0", default-features = false, optional = true }
+cargo-xwin = { version = "0.16.2", default-features = false, optional = true }
 
 # log
 tracing = "0.1.36"
@@ -101,7 +101,7 @@ multipart = { version = "0.18.0", features = ["client"], default-features = fals
 ureq = { version = "2.9.1", features = ["gzip", "json", "socks-proxy"], default-features = false, optional = true }
 native-tls = { version = "0.2.8", optional = true }
 rustls = { version = "0.21.9", optional = true }
-rustls-pemfile = { version = "1.0.1", optional = true }
+rustls-pemfile = { version = "2.0.0", optional = true }
 keyring = { version = "2.0.0", default-features = false, features = ["linux-no-secret-service"], optional = true }
 wild = { version = "2.1.0", optional = true }
 url = { version = "2.5.0", optional = true }

diff --git a/src/upload.rs b/src/upload.rs
@@ -371,7 +371,8 @@ fn http_agent() -> Result<ureq::Agent, UploadError> {
     let mut tls_builder = native_tls::TlsConnector::builder();
     if let Some(ca_bundle) = tls_ca_bundle() {
         let mut reader = io::BufReader::new(File::open(ca_bundle)?);
-        for cert in rustls_pemfile::certs(&mut reader)? {
+        for cert in rustls_pemfile::certs(&mut reader) {
+            let cert = cert?;
             tls_builder.add_root_certificate(native_tls::Certificate::from_pem(&cert)?);
         }
     }
@@ -387,7 +388,7 @@ fn http_agent() -> Result<ureq::Agent, UploadError> {
     let builder = ureq::builder().try_proxy_from_env(true);
     if let Some(ca_bundle) = tls_ca_bundle() {
         let mut reader = io::BufReader::new(File::open(ca_bundle)?);
-        let certs = rustls_pemfile::certs(&mut reader)?;
+        let certs = rustls_pemfile::certs(&mut reader).collect::<Result<Vec<_>, _>>()?;
         let mut root_certs = rustls::RootCertStore::empty();
         root_certs.add_parsable_certificates(&certs);
         let client_config = rustls::ClientConfig::builder()