ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2024-12-18 20:47:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

combined SPDM_FIRMWARE_BLOB and SPDM_FIRMWARE_CONFIG as they have the same internal data structure

Browse Source
This commit is contained in:
iadgovuser58 2024-06-20 17:28:30 -04:00
parent 6c6892b36b
commit b80f0cf743
3 changed files with 40 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/TpmPcrEvent.java
View File

@ -5,7 +5,8 @@ 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.EvEfiSpdmDevicePolicy;
import hirs.utils.tpm.eventlog.events.EvEfiSpdmDeviceSecurityEvent;
import hirs.utils.tpm.eventlog.events.EvEfiSpecIdEvent;
import hirs.utils.tpm.eventlog.events.EvEventTag;
import hirs.utils.tpm.eventlog.events.EvIPL;
@ -388,15 +389,14 @@ public class TpmPcrEvent {
case EvConstants.EV_EFI_HCRTM_EVENT:
break;
case EvConstants.EV_EFI_SPDM_FIRMWARE_BLOB:
case EvConstants.EV_EFI_SPDM_FIRMWARE_CONFIG:
try {
sb.append(new EvEfiSpdmFirmwareBlob(eventContent).toString());
sb.append(new EvEfiSpdmDeviceSecurityEvent(eventContent).toString());
} catch (UnsupportedEncodingException ueEx) {
log.error(ueEx);
sb.append(ueEx.toString());
}
break;
case EvConstants.EV_EFI_SPDM_FIRMWARE_CONFIG:
break;
case EvConstants.EV_EFI_SPDM_DEVICE_POLICY:
break;
default:
@ -563,10 +563,10 @@ public class TpmPcrEvent {
vendorTableFileStatus = efiVarAuth.getVendorTableFileStatus();
break;
case EvConstants.EV_EFI_SPDM_FIRMWARE_BLOB:
description += "Event Content:\n" + new EvEfiSpdmFirmwareBlob(content).toString();
description += "Event Content:\n" + new EvEfiSpdmDeviceSecurityEvent(content).toString();
break;
case EvConstants.EV_EFI_SPDM_FIRMWARE_CONFIG:
description += "Event Content:\n" + new EvEfiSpdmFirmwareConfig(content).toString();
description += "Event Content:\n" + new EvEfiSpdmDeviceSecurityEvent(content).toString();
break;
case EvConstants.EV_EFI_SPDM_DEVICE_POLICY:
description += "Event Content:\n" + new EvEfiSpdmDevicePolicy(content).toString();

14
HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/EvEfiSpdmDevicePolicy.java Normal file
View File

@ -0,0 +1,14 @@
package hirs.utils.tpm.eventlog.events;
public class EvEfiSpdmDevicePolicy {
/**
* EvEfiSpdmDevicePolicy constructor.
*
* @param eventData byte array holding the event to process.
*/
public EvEfiSpdmDevicePolicy(final byte[] eventData) {
}
}

37
HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/EvEfiSpdmFirmwareBlob.java → HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/EvEfiSpdmDeviceSecurityEvent.java
View File

@ -7,7 +7,8 @@ import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
/**
* Class to process the EV_EFI_SPDM_FIRMWARE_BLOB event. The event field MUST be a
* Abstract class to process any SPDM event that is solely a DEVICE_SECURITY_EVENT_DATA or
* DEVICE_SECURITY_EVENT_DATA2. The event field MUST be a
* 1) DEVICE_SECURITY_EVENT_DATA or
* 2) DEVICE_SECURITY_EVENT_DATA2
* DEVICE_SECURITY_EVENT_DATA has 2 structures:
@ -28,7 +29,7 @@ import java.nio.charset.StandardCharsets;
* firmware, such as immutable ROM, mutable firmware, firmware version, firmware secure version
* number, etc.
*/
public class EvEfiSpdmFirmwareBlob {
public class EvEfiSpdmDeviceSecurityEvent {
/**
* Signature (text) data.
@ -49,7 +50,7 @@ public class EvEfiSpdmFirmwareBlob {
* @param eventData byte array holding the event to process.
* @throws java.io.UnsupportedEncodingException if input fails to parse.
*/
public EvEfiSpdmFirmwareBlob(final byte[] eventData) throws UnsupportedEncodingException {
public EvEfiSpdmDeviceSecurityEvent(final byte[] eventData) throws UnsupportedEncodingException {
byte[] signatureBytes = new byte[UefiConstants.SIZE_15];
System.arraycopy(eventData, 0, signatureBytes, 0, UefiConstants.SIZE_15);
@ -78,14 +79,14 @@ public class EvEfiSpdmFirmwareBlob {
}
}
/**
* Determines if this event is a DeviceSecurityEventData.
*
* @return true of the event is a DeviceSecurityEventData.
*/
public boolean isSpdmDeviceSecurityEventData() {
return bSpdmDeviceSecurityEventData;
}
// /**
// * Determines if this event is a DeviceSecurityEventData.
// *
// * @return true of the event is a DeviceSecurityEventData.
// */
// public boolean isSpdmDeviceSecurityEventData() {
// return bSpdmDeviceSecurityEventData;
// }
/**
* Returns a description of this event.
@ -93,12 +94,14 @@ public class EvEfiSpdmFirmwareBlob {
* @return Human readable description of this event.
*/
public String toString() {
if (bSpdmDeviceSecurityEventData) {
spdmInfo = " Signature = SPDM Device Sec" + spdmInfo;
} else {
spdmInfo = "EV_EFI_SPDM_FIRMWARE_BLOB event named " + signature
+ " encountered but support for processing it has not been added to this application.\n";
}
spdmInfo = " Signature = SPDM Device Sec" + spdmInfo;
// if (bSpdmDeviceSecurityEventData) {
// spdmInfo = " Signature = SPDM Device Sec" + spdmInfo;
// } else {
// spdmInfo = "EV_EFI_SPDM_FIRMWARE_BLOB event named " + signature
// + " encountered but support for processing it has not been added to this application.\n";
// }
return spdmInfo;
}
}