mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
tls tidy-up
This commit is contained in:
parent
211e27b759
commit
044fed1096
3 changed files with 32 additions and 25 deletions
|
|
@ -21,10 +21,10 @@ pub fn shellchat<'a>(
|
||||||
write!(ret, "deleted {count} certificates").ok();
|
write!(ret, "deleted {count} certificates").ok();
|
||||||
log::info!("finished TLS delete certificates");
|
log::info!("finished TLS delete certificates");
|
||||||
}
|
}
|
||||||
|
// helpful stuff
|
||||||
Some("help") => {
|
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
|
// save/trust all Root CA's in webpki-roots en-masse
|
||||||
#[cfg(feature = "rootCA")]
|
#[cfg(feature = "rootCA")]
|
||||||
Some("mozilla") => {
|
Some("mozilla") => {
|
||||||
|
|
@ -70,7 +70,12 @@ pub fn shellchat<'a>(
|
||||||
};
|
};
|
||||||
let server_name = target.try_into().unwrap_or_else(|e| {
|
let server_name = target.try_into().unwrap_or_else(|e| {
|
||||||
log::warn!("failed to create sever_name from {target}: {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()
|
"bunnyfoo.com".try_into().unwrap()
|
||||||
});
|
});
|
||||||
let mut conn = rustls::ClientConnection::new(Arc::new(config), server_name).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) {
|
match tls.read_to_end(&mut plaintext) {
|
||||||
Ok(n) => {
|
Ok(n) => {
|
||||||
log::info!("tls received {} bytes", n);
|
log::info!("tls received {} bytes", n);
|
||||||
write!(ret, "{} {}\n", t!("tls.test_success_bytes", locales::LANG), n).ok();
|
write!(
|
||||||
log::info!(
|
ret,
|
||||||
"{}",
|
"{} {}\n",
|
||||||
std::str::from_utf8(&plaintext).unwrap_or("utf-error")
|
t!("tls.test_success_bytes", locales::LANG),
|
||||||
);
|
n
|
||||||
|
)
|
||||||
|
.ok();
|
||||||
|
log::info!("{}", from_utf8(&plaintext).unwrap_or("utf-error"));
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::warn!("failed to read tls response: {e}");
|
log::warn!("failed to read tls response: {e}");
|
||||||
|
|
@ -183,8 +191,18 @@ pub fn shellchat<'a>(
|
||||||
write!(ret, "\thelp\n").ok();
|
write!(ret, "\thelp\n").ok();
|
||||||
#[cfg(feature = "rootCA")]
|
#[cfg(feature = "rootCA")]
|
||||||
write!(ret, "\tmozilla\t{}\n", t!("tls.mozilla_cmd", locales::LANG)).ok();
|
write!(ret, "\tmozilla\t{}\n", t!("tls.mozilla_cmd", locales::LANG)).ok();
|
||||||
write!(ret, "\tprobe <host>\t{}\n", t!("tls.probe_cmd", locales::LANG)).ok();
|
write!(
|
||||||
write!(ret, "\ttest <host>\t{}\n", t!("tls.test_cmd", locales::LANG)).ok();
|
ret,
|
||||||
|
"\tprobe <host>\t{}\n",
|
||||||
|
t!("tls.probe_cmd", locales::LANG)
|
||||||
|
)
|
||||||
|
.ok();
|
||||||
|
write!(
|
||||||
|
ret,
|
||||||
|
"\ttest <host>\t{}\n",
|
||||||
|
t!("tls.test_cmd", locales::LANG)
|
||||||
|
)
|
||||||
|
.ok();
|
||||||
write!(ret, "\ttrusted\t{}\n", t!("tls.trusted_cmd", locales::LANG)).ok();
|
write!(ret, "\ttrusted\t{}\n", t!("tls.trusted_cmd", locales::LANG)).ok();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -265,14 +265,3 @@ fn open_hex(text: &str) -> String {
|
||||||
})
|
})
|
||||||
.collect::<String>()
|
.collect::<String>()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -119,13 +119,13 @@ impl<'a> From<&X509Certificate<'a>> for RustlsOwnedTrustAnchor {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Add a DER header to a DER encoded [u8]
|
/// Add a DER header to a DER encoded [u8]
|
||||||
fn add_der_header(tag: Tag, chook: &Vec<u8>) -> Result<Vec<u8>, Error> {
|
fn add_der_header(tag: Tag, naked: &Vec<u8>) -> Result<Vec<u8>, Error> {
|
||||||
match Header::new(tag, chook.len()) {
|
match Header::new(tag, naked.len()) {
|
||||||
Ok(header) => {
|
Ok(header) => {
|
||||||
let mut buff: [u8; 32] = [0u8; 32];
|
let mut buff: [u8; 32] = [0u8; 32];
|
||||||
match header.encode_to_slice(&mut buff) {
|
match header.encode_to_slice(&mut buff) {
|
||||||
Ok(der) => {
|
Ok(der) => {
|
||||||
let der = [der, chook].concat();
|
let der = [der, naked].concat();
|
||||||
match x509_parser::x509::X509Name::from_der(&der) {
|
match x509_parser::x509::X509Name::from_der(&der) {
|
||||||
Ok((_, decoded)) => Ok(decoded.as_raw().to_vec()),
|
Ok((_, decoded)) => Ok(decoded.as_raw().to_vec()),
|
||||||
Err(_) => Err(Error::new(ErrorKind::InvalidData, "der parse failed: from")),
|
Err(_) => Err(Error::new(ErrorKind::InvalidData, "der parse failed: from")),
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue