From 044fed1096bb6b4a7961aca5630f376305d2c51a Mon Sep 17 00:00:00 2001 From: nworbnhoj Date: Mon, 3 Jul 2023 19:01:05 +1000 Subject: [PATCH] tls tidy-up --- libs/tls/src/cmd.rs | 40 +++++++++++++++++++++++++++++----------- libs/tls/src/lib.rs | 11 ----------- libs/tls/src/rota.rs | 6 +++--- 3 files changed, 32 insertions(+), 25 deletions(-) diff --git a/libs/tls/src/cmd.rs b/libs/tls/src/cmd.rs index 43fd81dd0..d65f86d99 100644 --- a/libs/tls/src/cmd.rs +++ b/libs/tls/src/cmd.rs @@ -21,10 +21,10 @@ pub fn shellchat<'a>( write!(ret, "deleted {count} certificates").ok(); log::info!("finished TLS delete certificates"); } + // helpful stuff Some("help") => { - write!(ret, "{}", t!("tls.cmd_help", locales::LANG)).ok(); - () - } + write!(ret, "{}", t!("tls.cmd_help", locales::LANG)).ok(); + } // save/trust all Root CA's in webpki-roots en-masse #[cfg(feature = "rootCA")] Some("mozilla") => { @@ -70,7 +70,12 @@ pub fn shellchat<'a>( }; let server_name = target.try_into().unwrap_or_else(|e| { log::warn!("failed to create sever_name from {target}: {e}"); - write!(ret, "{} {target}", t!("tls.probe_fail_servername", locales::LANG)).ok(); + write!( + ret, + "{} {target}", + t!("tls.probe_fail_servername", locales::LANG) + ) + .ok(); "bunnyfoo.com".try_into().unwrap() }); let mut conn = rustls::ClientConnection::new(Arc::new(config), server_name).unwrap(); @@ -141,11 +146,14 @@ pub fn shellchat<'a>( match tls.read_to_end(&mut plaintext) { Ok(n) => { log::info!("tls received {} bytes", n); - write!(ret, "{} {}\n", t!("tls.test_success_bytes", locales::LANG), n).ok(); - log::info!( - "{}", - std::str::from_utf8(&plaintext).unwrap_or("utf-error") - ); + write!( + ret, + "{} {}\n", + t!("tls.test_success_bytes", locales::LANG), + n + ) + .ok(); + log::info!("{}", from_utf8(&plaintext).unwrap_or("utf-error")); } Err(e) => { log::warn!("failed to read tls response: {e}"); @@ -183,8 +191,18 @@ pub fn shellchat<'a>( write!(ret, "\thelp\n").ok(); #[cfg(feature = "rootCA")] write!(ret, "\tmozilla\t{}\n", t!("tls.mozilla_cmd", locales::LANG)).ok(); - write!(ret, "\tprobe \t{}\n", t!("tls.probe_cmd", locales::LANG)).ok(); - write!(ret, "\ttest \t{}\n", t!("tls.test_cmd", locales::LANG)).ok(); + write!( + ret, + "\tprobe \t{}\n", + t!("tls.probe_cmd", locales::LANG) + ) + .ok(); + write!( + ret, + "\ttest \t{}\n", + t!("tls.test_cmd", locales::LANG) + ) + .ok(); write!(ret, "\ttrusted\t{}\n", t!("tls.trusted_cmd", locales::LANG)).ok(); } } diff --git a/libs/tls/src/lib.rs b/libs/tls/src/lib.rs index c5f987324..e248bb17a 100644 --- a/libs/tls/src/lib.rs +++ b/libs/tls/src/lib.rs @@ -265,14 +265,3 @@ fn open_hex(text: &str) -> String { }) .collect::() } - - - - - - - - - - - diff --git a/libs/tls/src/rota.rs b/libs/tls/src/rota.rs index cf6b06f25..af040bdf0 100644 --- a/libs/tls/src/rota.rs +++ b/libs/tls/src/rota.rs @@ -119,13 +119,13 @@ impl<'a> From<&X509Certificate<'a>> for RustlsOwnedTrustAnchor { } /// Add a DER header to a DER encoded [u8] -fn add_der_header(tag: Tag, chook: &Vec) -> Result, Error> { - match Header::new(tag, chook.len()) { +fn add_der_header(tag: Tag, naked: &Vec) -> Result, Error> { + match Header::new(tag, naked.len()) { Ok(header) => { let mut buff: [u8; 32] = [0u8; 32]; match header.encode_to_slice(&mut buff) { Ok(der) => { - let der = [der, chook].concat(); + let der = [der, naked].concat(); match x509_parser::x509::X509Name::from_der(&der) { Ok((_, decoded)) => Ok(decoded.as_raw().to_vec()), Err(_) => Err(Error::new(ErrorKind::InvalidData, "der parse failed: from")),