manifest: Report the firmware and ROM measurements

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
westerndigitalcorporation · Mar 27, 2024 · 328015f · 328015f
1 parent 39a36e2
commit 328015f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/manifest/manifest.in.cbor b/manifest/manifest.in.cbor
@@ -14,8 +14,22 @@
       [
         / measurement-map / {
           / mval / 1: {
+            / name / 11: "ROM",
             / spdm-indirect / 12: {
-              / index / 0: [1, 2]
+              / index / 0: [1]
+            }
+          },
+          / authorised-by / 2: [
+            / tagged-pkix-base64-key-type / 554("base64_key_X")
+          ]
+        }
+      ],
+      [
+        / measurement-map / {
+          / mval / 1: {
+            / name / 11: "Firmware",
+            / spdm-indirect / 12: {
+              / index / 0: [2]
             }
           },
           / authorised-by / 2: [

diff --git a/src/libspdm/spdm.rs b/src/libspdm/spdm.rs
@@ -277,7 +277,7 @@ pub const LIBSPDM_MAX_SPDM_MSG_SIZE: u32 = 0x2000;
 
 const OPAQUE_SIZE: usize = 0;
 
-const LIBSPDM_MEASUREMENT_BLOCK_HASH_NUMBER: u32 = 4;
+const LIBSPDM_MEASUREMENT_BLOCK_HASH_NUMBER: u32 = 2;
 const LIBSPDM_MEASUREMENT_BLOCK_NUMBER: u8 =
     LIBSPDM_MEASUREMENT_BLOCK_HASH_NUMBER as u8 + 1 + 1 + 1;