[hsmtool] Correctly handle missing SPX IDs

It is legal for SPX key entities to be missing a PKCS#11 `id`. Signed-off-by: Chris Frantz <[email protected]>
lowRISC · Dec 19, 2024 · 5164e7b · 5164e7b
1 parent 65e163e
commit 5164e7b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/sw/host/hsmtool/src/commands/spx/generate.rs b/sw/host/hsmtool/src/commands/spx/generate.rs
@@ -53,7 +53,7 @@ impl Dispatch for Generate {
 
         Ok(Box::new(BasicResult {
             success: true,
-            id: AttrData::Str(key.hash.expect("key hash")),
+            id: key.hash.map_or(AttrData::None, AttrData::Str),
             label: AttrData::Str(key.alias),
             value: None,
             error: None,

diff --git a/sw/host/hsmtool/src/commands/spx/import.rs b/sw/host/hsmtool/src/commands/spx/import.rs
@@ -48,7 +48,7 @@ impl Dispatch for Import {
         )?;
         Ok(Box::new(BasicResult {
             success: true,
-            id: AttrData::Str(key.hash.expect("key hash")),
+            id: key.hash.map_or(AttrData::None, AttrData::Str),
             label: AttrData::Str(key.alias),
             value: None,
             error: None,