commit 1709780d8c9e263e353c069c92f105078e6fed12
author Jon Flatley <jflat@google.com> Thu May 05 12:11:31 2022 -0400
committer jon-flatley <47988881+jon-flatley@users.noreply.github.com> Thu May 05 17:10:37 2022 -0400
tree 11c0915a9d3940160d071077ba15cfcc27708774
parent 2cf0ca42813deddc62f1c5c08ff580264b52a5d2

[opentitantool] Implement image digest command

Signed-off-by: Jon Flatley <jflat@google.com>

sw/host/opentitantool/src/command/image.rs

diff --git a/sw/host/opentitantool/src/command/image.rs b/sw/host/opentitantool/src/command/image.rs
index 99e7145..26b6333 100644
--- a/sw/host/opentitantool/src/command/image.rs
+++ b/sw/host/opentitantool/src/command/image.rs
@@ -5,6 +5,8 @@
 use anyhow::{ensure, Result};
 use erased_serde::Serialize;
 use std::any::Any;
+use std::fs::File;
+use std::io::Write;
 use std::path::PathBuf;
 use structopt::StructOpt;
 
@@ -147,6 +149,14 @@
         help = "Filename for the image to calculate the digest for"
     )]
     image: PathBuf,
+    #[structopt(short, long, help = "Filename for an output bin file")]
+    bin: Option<PathBuf>,
+}
+
+/// Response format for the digest command.
+#[derive(serde::Serialize)]
+pub struct DigestResponse {
+    pub digest: String,
 }
 
 impl CommandDispatch for DigestCommand {
@@ -155,7 +165,15 @@
         _context: &dyn Any,
         _transport: &TransportWrapper,
     ) -> Result<Option<Box<dyn Serialize>>> {
-        Ok(None)
+        let image = image::Image::read_from_file(&self.image)?;
+        let digest = image.compute_digest();
+        if let Some(bin) = &self.bin {
+            let mut file = File::create(bin)?;
+            file.write(&digest)?;
+        }
+        Ok(Some(Box::new(DigestResponse {
+            digest: format!("{}", hex::encode(&digest)),
+        })))
     }
 }
 
@@ -171,4 +189,6 @@
 /// Image manipulation commands.
 pub enum Image {
     Assemble(AssembleCommand),
+    Manifest(ManifestCommand),
+    Digest(DigestCommand),
 }