[opentitantool] Output OTP image overlays with hex values

Signed-off-by: Jon Flatley <[email protected]>

Author: Jon Flatley

sw/host/opentitanlib/src/otp/otp_img.rs

@@ -12,7 +12,9 @@ use anyhow::{anyhow, bail, Result};
 use serde::de::{self, Unexpected};
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Debug, PartialEq, Eq)]
+use serde_annotate::Annotate;
+
+#[derive(Annotate, Serialize, Debug, PartialEq, Eq)]
 #[serde(untagged)]
 pub enum OtpImgValue {
     Word(u64),
@@ -90,22 +92,25 @@ impl<'de> Deserialize<'de> for OtpImgValue {
     }
 }
 
-#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
+#[derive(Annotate, Serialize, Deserialize, Debug, PartialEq, Eq)]
 pub struct OtpImgItem {
     pub name: String,
     pub value: OtpImgValue,
 }
 
-#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
+#[derive(Annotate, Serialize, Deserialize, Debug, PartialEq, Eq)]
 pub struct OtpImgPartition {
     pub name: String,
     pub items: Option<Vec<OtpImgItem>>,
 }
 
-#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
+#[derive(Annotate, Serialize, Deserialize, Debug, PartialEq, Eq)]
 pub struct OtpImg {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub seed: Option<u64>,
+    // This attribute shouldn't be here, it should be in `OtpImgValue`, but due to a bug in
+    // serde_annotate this is needed to get values serialized in hex.
+    #[annotate(format = hex)]
     pub partitions: Vec<OtpImgPartition>,
 }
 

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

@@ -9,7 +9,7 @@ use std::path::PathBuf;
 
 use anyhow::{bail, Result};
 
-use serde_annotate::{serialize, Annotate};
+use serde_annotate::{serialize, Annotate, Base};
 
 use structopt::StructOpt;
 
@@ -91,7 +91,13 @@ impl CommandDispatch for AlertDigest {
 
         if let Some(output) = &self.output {
             let mut file = File::create(&output)?;
-            file.write_all(serialize(&img_out)?.to_json().to_string().as_bytes())?;
+            file.write_all(
+                serialize(&img_out)?
+                    .to_json()
+                    .bases(&[Base::Hex])
+                    .to_string()
+                    .as_bytes(),
+            )?;
             Ok(None)
         } else {
             Ok(Some(Box::new(img_out)))