diff --git a/libs/tls/locales/i18n.json b/libs/tls/locales/i18n.json index 1a918f07e..d2b499427 100644 --- a/libs/tls/locales/i18n.json +++ b/libs/tls/locales/i18n.json @@ -19,6 +19,10 @@ "en": "deleted Certificates", "en-tts": "deleted Certificates" }, + "tls.list_cmd": { + "en": "list trusted CA certificates", + "en-tts": "list trusted CA certificates" + }, "tls.mozilla_cmd": { "en": "trust all Root CA's in webpki-roots", "en-tts": "trust all Root CA's in webpki-roots" @@ -54,9 +58,5 @@ "tls.test_success_bytes": { "en": "tls received bytes", "en-tts": "tls received bytes" - }, - "tls.trusted_cmd": { - "en": "list trusted CA certificates", - "en-tts": "list trusted CA certificates" } } diff --git a/libs/tls/src/cmd.rs b/libs/tls/src/cmd.rs index e670d244b..bb08a5320 100644 --- a/libs/tls/src/cmd.rs +++ b/libs/tls/src/cmd.rs @@ -27,6 +27,16 @@ pub fn shellchat<'a>( Some("help") => { write!(ret, "{}", t!("tls.cmd_help", locales::LANG)).ok(); } + // list trusted Certificate Authority certificates + Some("list") => { + log::set_max_level(log::LevelFilter::Info); + log::info!("starting TLS trusted listing"); + let tls = Tls::new(); + for rota in tls.trusted() { + write!(ret, "🏛 {}\n", rota.subject()).ok(); + } + log::info!("finished TLS trusted listing"); + } // save/trust all Root CA's in webpki-roots en-masse #[cfg(feature = "rootCA")] Some("mozilla") => { @@ -185,20 +195,11 @@ pub fn shellchat<'a>( log::set_max_level(log::LevelFilter::Info); } - // list trusted Certificate Authority certificates - Some("trusted") => { - log::set_max_level(log::LevelFilter::Info); - log::info!("starting TLS trusted listing"); - let tls = Tls::new(); - for rota in tls.trusted() { - write!(ret, "🏛 {}\n", rota.subject()).ok(); - } - log::info!("finished TLS trusted listing"); - } None | _ => { write!(ret, "{}\n", t!("tls.cmd", locales::LANG)).ok(); write!(ret, "\tdeleteall\t{}\n", t!("tls.deleteall_cmd", locales::LANG)).ok(); write!(ret, "\thelp\n").ok(); + write!(ret, "\tlist\t{}\n", t!("tls.list_cmd", locales::LANG)).ok(); #[cfg(feature = "rootCA")] write!(ret, "\tmozilla\t{}\n", t!("tls.mozilla_cmd", locales::LANG)).ok(); write!( @@ -213,7 +214,6 @@ pub fn shellchat<'a>( t!("tls.test_cmd", locales::LANG) ) .ok(); - write!(ret, "\ttrusted\t{}\n", t!("tls.trusted_cmd", locales::LANG)).ok(); } } Ok(Some(ret))