From 4e0298c17ad2c51aa220a88dc69bf2f56e51076f Mon Sep 17 00:00:00 2001 From: nworbnhoj Date: Tue, 4 Jul 2023 07:34:55 +1000 Subject: [PATCH] include broken tls::rota::public_key() --- libs/tls/src/lib.rs | 3 --- libs/tls/src/rota.rs | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/libs/tls/src/lib.rs b/libs/tls/src/lib.rs index 7cf1c95db..22ba7272d 100644 --- a/libs/tls/src/lib.rs +++ b/libs/tls/src/lib.rs @@ -134,8 +134,6 @@ impl Tls { // saves a tls trust-anchor to the pddb pub fn save_cert(&self, ta: &RustlsOwnedTrustAnchor) -> Result<(), Error> { - // let xns = XousNames::new().unwrap(); - // let modals = Modals::new(&xns).unwrap(); let key = ta.pddb_key(); match self.pddb.get( TLS_TRUSTED_DICT, @@ -163,7 +161,6 @@ impl Tls { let pos_bytes = pos.to_be_bytes(); bytes[0] = pos_bytes[0]; bytes[1] = pos_bytes[1]; - match pddb_key.write(&bytes) { Ok(len) => { self.pddb.sync().ok(); diff --git a/libs/tls/src/rota.rs b/libs/tls/src/rota.rs index af040bdf0..c78e49f39 100644 --- a/libs/tls/src/rota.rs +++ b/libs/tls/src/rota.rs @@ -50,6 +50,26 @@ impl RustlsOwnedTrustAnchor { } } + // decoded public key + // see https://docs.rs/x509-parser/0.15.0/src/x509_parser/x509.rs.html#260-274 + #[allow(unreachable_code)] + pub fn public_key(&self) -> Result, Error> { + todo!(); // fails decode + match add_der_header(Tag::Sequence, &self.spki) { + Ok(der) => match x509_parser::x509::SubjectPublicKeyInfo::from_der(&der) { + Ok((_, spki)) => Ok(spki.subject_public_key.data.to_vec()), + Err(e) => { + log::warn!("{:?}", e); + Err(Error::new(ErrorKind::InvalidData, "failed spki der decode")) + } + }, + Err(e) => { + log::warn!("{:?}", e.into_inner().unwrap()); + Err(Error::new(ErrorKind::InvalidData, "failed spki der header")) + } + } + } + pub fn pddb_key(&self) -> String { let subject = &self.subject(); let begin = match subject.find("CN=") {