fix: rustls 0.23 compatibility

Author: veeso

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 - [Changelog](#changelog)
+  - [0.2.2](#022)
   - [0.2.1](#021)
   - [0.2.0](#020)
   - [0.1.4](#014)
@@ -11,6 +12,12 @@
 
 ---
 
+## 0.2.2
+
+Released on 18/10/2024
+
+- Fix rustls 0.23
+
 ## 0.2.1
 
 Released on 07/10/2024

Cargo.toml

@@ -10,13 +10,14 @@ license = "MIT"
 name = "remotefs-ftp"
 readme = "README.md"
 repository = "https://github.com/remotefs-rs/remotefs-rs-ftp"
-version = "0.2.1"
+version = "0.2.2"
 
 [dependencies]
 log = "^0.4"
 remotefs = "^0.3"
 suppaftp = "^6"
-webpki-roots = { version = "^0.22", optional = true }
+rustls-pki-types = { version = "1", optional = true }
+webpki-roots = { version = "0.26", optional = true }
 
 [dev-dependencies]
 env_logger = "^0.11"
@@ -29,7 +30,7 @@ tempfile = "^3"
 default = ["find"]
 # TLS
 native-tls = ["suppaftp/native-tls"]
-rustls = ["suppaftp/rustls", "webpki-roots"]
+rustls = ["suppaftp/rustls", "dep:rustls-pki-types", "dep:webpki-roots"]
 secure = ["native-tls"]
 vendored = ["suppaftp/native-tls-vendored"]
 # misc

README.md

@@ -11,7 +11,7 @@
 <p align="center">~ Remotefs FTP client ~</p>
 
 <p align="center">Developed by <a href="https://veeso.github.io/" target="_blank">@veeso</a></p>
-<p align="center">Current version: 0.2.0 (30/09/2024)</p>
+<p align="center">Current version: 0.2.2 (18/10/2024)</p>
 
 <p align="center">
   <a href="https://opensource.org/licenses/MIT"

src/client.rs

@@ -216,16 +216,15 @@ impl FtpFs {
     #[cfg(feature = "rustls")]
     fn setup_tls_connector(&self) -> RemoteResult<TlsConnector> {
         let mut root_store = suppaftp::rustls::RootCertStore::empty();
-        root_store.add_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.0.iter().map(|ta| {
-            suppaftp::rustls::OwnedTrustAnchor::from_subject_spki_name_constraints(
-                ta.subject,
-                ta.spki,
-                ta.name_constraints,
-            )
+        root_store.extend(webpki_roots::TLS_SERVER_ROOTS.iter().map(|ta| {
+            rustls_pki_types::TrustAnchor {
+                subject: ta.subject.clone(),
+                subject_public_key_info: ta.subject_public_key_info.clone(),
+                name_constraints: ta.name_constraints.clone(),
+            }
         }));
         Ok(std::sync::Arc::new(
             ClientConfig::builder()
-                .with_safe_defaults()
                 .with_root_certificates(root_store)
                 .with_no_client_auth(),
         )