From 8ed22b8257f5a744c2d07af48e2b0647fcb59160 Mon Sep 17 00:00:00 2001
From: nworbnhoj <john@nhoj.info>
Date: Tue, 27 Feb 2024 08:48:10 +1000
Subject: [PATCH] refine shellchat `net tls mozilla`

---
 libs/tls/src/cmd.rs | 8 +++-----
 libs/tls/src/ota.rs | 1 -
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/libs/tls/src/cmd.rs b/libs/tls/src/cmd.rs
index 282d7dbf2..de0d9e35f 100644
--- a/libs/tls/src/cmd.rs
+++ b/libs/tls/src/cmd.rs
@@ -39,18 +39,16 @@ pub fn shellchat<'a>(mut tokens: impl Iterator<Item = &'a str>) -> Result<Option
         // save/trust all Root CA's in webpki-roots en-masse
         #[cfg(feature = "rootCA")]
         Some("mozilla") => {
-            let otas: Vec<crate::OwnedTrustAnchor> =
-                webpki_roots::TLS_SERVER_ROOTS.iter().map(|ta| (*ta).clone().into()).collect();
-            let mut count: u32 = otas.len().try_into().unwrap();
             let xns = XousNames::new().unwrap();
             let modals = Modals::new(&xns).unwrap();
+            let mut count: u32 = webpki_roots::TLS_SERVER_ROOTS.len().try_into().unwrap();
             modals
                 .start_progress(t!("tls.mozilla_progress", locales::LANG), 0, count, 0)
                 .expect("no progress");
             count = 0;
             let tls = Tls::new();
-            for rota in otas {
-                tls.save_ta(&rota).unwrap_or_else(|e| log::warn!("{e}"));
+            for ta in webpki_roots::TLS_SERVER_ROOTS {
+                tls.save_ta(&(*ta).clone().into()).unwrap_or_else(|e| log::warn!("{e}"));
                 modals.update_progress(count).expect("no progress");
                 count += 1;
             }
diff --git a/libs/tls/src/ota.rs b/libs/tls/src/ota.rs
index a5e0992aa..311a41846 100644
--- a/libs/tls/src/ota.rs
+++ b/libs/tls/src/ota.rs
@@ -106,6 +106,5 @@ impl<'a> Into<TrustAnchor<'a>> for OwnedTrustAnchor {
             subject_public_key_info: Der::from(self.spki),
             name_constraints: self.name_constraints.map_or(None, |nc| Some(Der::from(nc))),
         }
-        .to_owned()
     }
 }