From 22de2bc6149a675a8df6a8bb13e3ec51ff2e98e9 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Wed, 26 Oct 2022 22:32:24 +0800 Subject: [PATCH] tools: sign_image: fix utterly broken git signing The previous approach didn't work, for unknown reasons. Signed-off-by: Sean Cross --- tools/src/sign_image.rs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/src/sign_image.rs b/tools/src/sign_image.rs index 25107ef42..86ddacd7d 100644 --- a/tools/src/sign_image.rs +++ b/tools/src/sign_image.rs @@ -15,11 +15,6 @@ pub fn load_pem(src: &str) -> Result> { Ok(pem::parse(input)?) } -fn semver_to_u8() -> Result<[u8; 16], &'static str> { - let a = SemVer::from_git()?; - Ok(a.into()) -} - pub fn sign_image( source: &[u8], private_key: &pem::Pem, @@ -37,9 +32,13 @@ pub fn sign_image( } else { [0u8; 16] }; - let semver: [u8; 16] = semver - .ok_or_else(|| semver_to_u8()) - .map_err(|_| Error::new(ErrorKind::Other, "error parsing current Git rev"))?; + let semver: [u8; 16] = match semver { + Some(semver) => semver, + None => SemVer::from_git() + .map_err(|_| Error::new(ErrorKind::Other, "error parsing current Git rev"))? + .into(), + }; + // extra data appended here needs to be reflected in two places in Xous: // 1. root-keys/src/implementation.rs @ sign-loader() // 2. graphics-server/src/main.rs @ Some(Opcode::BulkReadfonts)