Update to rustls-native-certs 0.8 (#743)

* Update to rustls-native-certs 0.8

* Add rustls-native-certs 0.8 change to rustls_0_22.rs

* Update rustls-native-certs versions in docs

---------

Co-authored-by: Yuki Okushi <[email protected]>

Author: kpcyrd

Cargo.lock

@@ -51,12 +51,12 @@ rustls-0_21-native-roots = ["tokio-rustls-024", "dep:rustls-native-certs-06"]
 # use rustls v0.22 impls
 rustls-0_22 = ["dep:tokio-rustls-025", "dep:rustls-pki-types-1"]
 rustls-0_22-webpki-roots = ["rustls-0_22", "dep:webpki-roots-026"]
-rustls-0_22-native-roots = ["rustls-0_22", "dep:rustls-native-certs-07"]
+rustls-0_22-native-roots = ["rustls-0_22", "dep:rustls-native-certs-08"]
 
 # use rustls v0.23 impls
 rustls-0_23 = ["dep:tokio-rustls-026", "dep:rustls-pki-types-1"]
 rustls-0_23-webpki-roots = ["rustls-0_23", "dep:webpki-roots-026"]
-rustls-0_23-native-roots = ["rustls-0_23", "dep:rustls-native-certs-07"]
+rustls-0_23-native-roots = ["rustls-0_23", "dep:rustls-native-certs-08"]
 
 # use native-tls impls
 native-tls = ["dep:tokio-native-tls"]
@@ -105,7 +105,7 @@ webpki-roots-026 = { package = "webpki-roots", version = "0.26", optional = true
 
 # native root certificates for rustls impls
 rustls-native-certs-06 = { package = "rustls-native-certs", version = "0.6", optional = true }
-rustls-native-certs-07 = { package = "rustls-native-certs", version = "0.7", optional = true }
+rustls-native-certs-08 = { package = "rustls-native-certs", version = "0.8", optional = true }
 
 # native-tls
 tokio-native-tls = { version = "0.3", optional = true }

actix-tls/Cargo.toml

@@ -35,12 +35,17 @@ pub mod reexports {
 ///
 /// See [`rustls_native_certs::load_native_certs()`] for more info on behavior and errors.
 ///
-/// [`rustls_native_certs::load_native_certs()`]: rustls_native_certs_07::load_native_certs()
+/// [`rustls_native_certs::load_native_certs()`]: rustls_native_certs_08::load_native_certs()
 #[cfg(feature = "rustls-0_22-native-roots")]
 pub fn native_roots_cert_store() -> io::Result<tokio_rustls::rustls::RootCertStore> {
     let mut root_certs = tokio_rustls::rustls::RootCertStore::empty();
 
-    for cert in rustls_native_certs_07::load_native_certs()? {
+    let certs = rustls_native_certs_08::load_native_certs();
+    if let Some(err) = certs.errors.into_iter().next() {
+        return Err(io::Error::other(err));
+    }
+
+    for cert in certs.certs {
         root_certs.add(cert).unwrap();
     }
 

actix-tls/src/connect/rustls_0_22.rs

@@ -35,12 +35,17 @@ pub mod reexports {
 ///
 /// See [`rustls_native_certs::load_native_certs()`] for more info on behavior and errors.
 ///
-/// [`rustls_native_certs::load_native_certs()`]: rustls_native_certs_07::load_native_certs()
+/// [`rustls_native_certs::load_native_certs()`]: rustls_native_certs_08::load_native_certs()
 #[cfg(feature = "rustls-0_23-native-roots")]
 pub fn native_roots_cert_store() -> io::Result<tokio_rustls::rustls::RootCertStore> {
     let mut root_certs = tokio_rustls::rustls::RootCertStore::empty();
 
-    for cert in rustls_native_certs_07::load_native_certs()? {
+    let certs = rustls_native_certs_08::load_native_certs();
+    if let Some(err) = certs.errors.into_iter().next() {
+        return Err(io::Error::other(err));
+    }
+
+    for cert in certs.certs {
         root_certs.add(cert).unwrap();
     }