From 194865b4e6427fd7038b42ece0e2ffe985549639 Mon Sep 17 00:00:00 2001 From: iadgovuser58 <124906646+iadgovuser58@users.noreply.github.com> Date: Tue, 16 Apr 2024 19:38:32 -0400 Subject: [PATCH] spdm processing --- ...os_measurements_addEvt11asSPDMFirmwareBlob | Bin 0 -> 23866 bytes .../hirs/utils/tpm/eventlog/TpmPcrEvent.java | 4 ++ .../events/DeviceSecurityEventData.java | 46 +++++++++++++----- .../events/EvEfiSpdmFirmwareBlob.java | 1 + 4 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 0_temp/binary_bios_measurements_addEvt11asSPDMFirmwareBlob diff --git a/0_temp/binary_bios_measurements_addEvt11asSPDMFirmwareBlob b/0_temp/binary_bios_measurements_addEvt11asSPDMFirmwareBlob new file mode 100644 index 0000000000000000000000000000000000000000..1feda691732602357492bc27fd0bdcec33f33edd GIT binary patch literal 23866 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 Ba-jeK literal 0 HcmV?d00001 diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/TpmPcrEvent.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/TpmPcrEvent.java index d2f685ba..f921ee4d 100644 --- a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/TpmPcrEvent.java +++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/TpmPcrEvent.java @@ -5,6 +5,7 @@ import hirs.utils.tpm.eventlog.events.EvCompactHash; import hirs.utils.tpm.eventlog.events.EvConstants; import hirs.utils.tpm.eventlog.events.EvEfiGptPartition; import hirs.utils.tpm.eventlog.events.EvEfiHandoffTable; +import hirs.utils.tpm.eventlog.events.EvEfiSpdmFirmwareBlob; import hirs.utils.tpm.eventlog.events.EvEfiSpecIdEvent; import hirs.utils.tpm.eventlog.events.EvEventTag; import hirs.utils.tpm.eventlog.events.EvIPL; @@ -534,6 +535,8 @@ public class TpmPcrEvent { description += "Event Content:\n" + new UefiVariable(content).toString(); break; case EvConstants.EV_EFI_SPDM_FIRMWARE_BLOB: + EvEfiSpdmFirmwareBlob efiSpdmFwBlob = new EvEfiSpdmFirmwareBlob(content); + description += "Event Content:\n" + efiSpdmFwBlob.toString(); default: description += " Unknown Event found" + "\n"; } @@ -549,6 +552,7 @@ public class TpmPcrEvent { */ private static String eventString(final long event) { + System.out.println("XXXX " + event); if (event == EvConstants.EV_PREBOOT_CERT) { return "EV_PREBOOT_CERT"; } else if (event == EvConstants.EV_POST_CODE) { diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventData.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventData.java index 779d2c3e..560965ee 100644 --- a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventData.java +++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventData.java @@ -113,18 +113,38 @@ public class DeviceSecurityEventData { } dSEDdeviceContext = new DeviceSecurityEventDataDeviceContext(dSEDbytes, byteOffset); - if (version == "1") { - dSEDinfo =+ - dSEDataHeader.getDSEDheaderInfo(); - dSEDinfo =+ - dSEDdeviceContext.getdSEDdeviceContextInfo(); - } else if (version == "2") { - dSEDinfo =+ - dSEDheader.getDSEDheaderInfo(); - dSEDinfo =+ - dSEDsubHeader.getDSEDsubHeaderInfo(); - dSEDinfo =+ - dSEDdeviceContext.getDSEDdeviceContextInfo(); - } +// if (version == "1") { +// dSEDinfo =+ +// dSEDataHeader.getDSEDheaderInfo(); +// dSEDinfo =+ +// dSEDdeviceContext.getdSEDdeviceContextInfo(); +// } else if (version == "2") { +// dSEDinfo =+ +// dSEDheader.getDSEDheaderInfo(); +// dSEDinfo =+ +// dSEDsubHeader.getDSEDsubHeaderInfo(); +// dSEDinfo =+ +// dSEDdeviceContext.getDSEDdeviceContextInfo(); +// } + } + + public String toString() { + String specInfo = ""; + + specInfo += " Signature = SPDM Device Sec : "; +// if (specIDEvent.isCryptoAgile()) { +// specInfo += "Log format is Crypto Agile\n"; +// } else { +// specInfo += "Log format is SHA 1 (NOT Crypto Agile)\n"; +// } +// specInfo += " Platform Profile Specification version = " +// + specIDEvent.getVersionMajor() + "." + specIDEvent.getVersionMinor() +// + " using errata version " + specIDEvent.getErrata(); +// specInfo += DeviceSecurityEventData.toString(); +// } else { +// specInfo = "EV_EFI_SPDM_FIRMWARE_BLOB event named " + signature +// + " encountered but support for processing it has not been added to this application.\n"; +// } + return specInfo; } } diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/EvEfiSpdmFirmwareBlob.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/EvEfiSpdmFirmwareBlob.java index f5c49860..89863723 100644 --- a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/EvEfiSpdmFirmwareBlob.java +++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/EvEfiSpdmFirmwareBlob.java @@ -91,6 +91,7 @@ public class EvEfiSpdmFirmwareBlob { // specInfo += " Platform Profile Specification version = " // + specIDEvent.getVersionMajor() + "." + specIDEvent.getVersionMinor() // + " using errata version " + specIDEvent.getErrata(); +// specInfo += DeviceSecurityEventData.toString(); } else { specInfo = "EV_EFI_SPDM_FIRMWARE_BLOB event named " + signature + " encountered but support for processing it has not been added to this application.\n";