Upgrade rustls to 0.22 (#1929)

PyO3 · Feb 1, 2024 · 9406d87 · 9406d87
1 parent 81abd57
commit 9406d87
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 33 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.3", default-features = false, optional = true }
-cargo-xwin = { version = "0.16.2", default-features = false, optional = true }
+cargo-xwin = { version = "0.16.4", default-features = false, optional = true }
 
 # log
 tracing = "0.1.36"
@@ -98,13 +98,13 @@ bytesize = { version = "1.0.1", optional = true }
 configparser = { version = "3.0.3", optional = true }
 dirs = { version = "5.0.0", optional = true }
 multipart = { version = "0.18.0", features = ["client"], default-features = false, optional = true }
-ureq = { version = "2.9.1", features = ["gzip", "json", "socks-proxy"], default-features = false, optional = true }
+ureq = { version = "2.9.4", 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 = { version = "0.22.2", 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 }
+url = { version = "2.3.0", optional = true }
 
 [dev-dependencies]
 expect-test = "1.4.1"

diff --git a/src/upload.rs b/src/upload.rs
@@ -390,9 +390,8 @@ fn http_agent() -> Result<ureq::Agent, UploadError> {
         let mut reader = io::BufReader::new(File::open(ca_bundle)?);
         let certs = rustls_pemfile::certs(&mut reader).collect::<Result<Vec<_>, _>>()?;
         let mut root_certs = rustls::RootCertStore::empty();
-        root_certs.add_parsable_certificates(&certs);
+        root_certs.add_parsable_certificates(certs);
         let client_config = rustls::ClientConfig::builder()
-            .with_safe_defaults()
             .with_root_certificates(root_certs)
             .with_no_client_auth();
         Ok(builder.tls_config(Arc::new(client_config)).build())