Format and fix dependency

Signed-off-by: Yerzhan Mazhkenov <20302932+yerzhan7@users.noreply.github.com>

Author: yerzhan7

Cargo.lock

@@ -49,13 +49,13 @@ hyper = { version = "1.9.0", features = ["server", "http1"] }
 hyper-util = { version = "0.1.20", features = ["tokio"] }
 proptest = "1.11.0"
 rcgen = "0.13.2"
-rustls = "0.23.34"
-rustls-pemfile = "2.2.0"
+rustls = "0.23.40"
+rustls-pki-types = { version = "1.14.1", features = ["std", "alloc"] }
 rusty-fork = "0.3.1"
 tempfile = "3.27.0"
 test-case = "3.3.1"
 tokio = { version = "1.52.1", features = ["rt", "rt-multi-thread", "macros", "net", "io-util"] }
-tokio-rustls = "0.26.2"
+tokio-rustls = "0.26.4"
 tracing-subscriber = { version = "0.3.23", features = ["fmt", "env-filter"] }
 
 # HACK: we want our own tests to use the mock client, but don't want to enable it for consumers by

mountpoint-s3-client/Cargo.toml

@@ -16,6 +16,7 @@ use mountpoint_s3_client::config::{
 use mountpoint_s3_client::{NewClientError, S3CrtClient};
 use rcgen::{BasicConstraints, CertificateParams, DnType, IsCa, KeyPair};
 use rustls::ServerConfig;
+use rustls::pki_types::pem::PemObject;
 use rustls::pki_types::{CertificateDer, PrivateKeyDer};
 use rusty_fork::rusty_fork_test;
 use tokio::net::TcpListener;
@@ -77,18 +78,11 @@ fn write_pem(dir: &Path, name: &str, contents: &[u8]) -> PathBuf {
 }
 
 fn parse_cert_der(pem: &[u8]) -> CertificateDer<'static> {
-    let mut cursor = std::io::Cursor::new(pem);
-    rustls_pemfile::certs(&mut cursor)
-        .next()
-        .expect("one cert")
-        .expect("parse cert")
+    CertificateDer::from_pem_slice(pem).expect("parse cert")
 }
 
 fn parse_key_der(pem: &[u8]) -> PrivateKeyDer<'static> {
-    let mut cursor = std::io::Cursor::new(pem);
-    rustls_pemfile::private_key(&mut cursor)
-        .expect("parse private key")
-        .expect("private key present")
+    PrivateKeyDer::from_pem_slice(pem).expect("parse private key")
 }
 
 // ---------------------------------------------------------------------------

mountpoint-s3-client/tests/tls.rs

@@ -25,7 +25,7 @@ ctor = "0.10.1"
 rand = "0.10.1"
 rcgen = "0.13.2"
 serde_json = "1.0.149"
-tempfile = "3.13.0"
+tempfile = "3.27.0"
 test-case = "3.3.1"
 tracing = { version = "0.1.44", default-features = false, features = ["std", "log"] }
 tracing-subscriber = { version = "0.3.23", features = ["fmt", "env-filter"] }

mountpoint-s3-crt/Cargo.toml

@@ -972,7 +972,11 @@ mod tests {
     fn ca_bundle_flag_threads_through_to_client_config() {
         let ca = PathBuf::from("/some/path/flag-ca.pem");
         let cli_args = CliArgs::try_parse_from([
-            "mount-s3", "bucket", "test/location", "--ca-bundle", ca.to_str().unwrap(),
+            "mount-s3",
+            "bucket",
+            "test/location",
+            "--ca-bundle",
+            ca.to_str().unwrap(),
         ])
         .expect("parse succeeds");