From 328015f300656b2138b393ec966c36c4dbd9c3f5 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Wed, 27 Mar 2024 11:34:42 +1000 Subject: [PATCH] manifest: Report the firmware and ROM measurements Signed-off-by: Alistair Francis --- manifest/manifest.in.cbor | 16 +++++++++++++++- src/libspdm/spdm.rs | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/manifest/manifest.in.cbor b/manifest/manifest.in.cbor index e9f2c21..fb1ad4d 100644 --- 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 index 7274d9c..8be37b3 100644 --- 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;