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

spdm processing

Browse Source
This commit is contained in:
iadgovuser58 2024-04-18 17:08:36 -04:00 committed by chubtub
parent c903400bac
commit 851753b5d4
2 changed files with 63 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataHeader.java
View File

@ -3,6 +3,7 @@ package hirs.utils.tpm.eventlog.events;
import hirs.utils.HexUtils; import hirs.utils.HexUtils;
import hirs.utils.tpm.eventlog.TcgTpmtHa; import hirs.utils.tpm.eventlog.TcgTpmtHa;
import hirs.utils.tpm.eventlog.spdm.SpdmHa; import hirs.utils.tpm.eventlog.spdm.SpdmHa;
import hirs.utils.tpm.eventlog.spdm.SpdmMeasurementBlock;
import hirs.utils.tpm.eventlog.uefi.UefiConstants; import hirs.utils.tpm.eventlog.uefi.UefiConstants;
import lombok.Getter; import lombok.Getter;
@ -138,11 +139,14 @@ public class DeviceSecurityEventDataHeader {
*/ */
@Getter @Getter
private String h1SpdmHashAlgo = ""; private String h1SpdmHashAlgo = "";
// /**
// * Type Header 1 SPDM Measurement Block list.
// */
// private List<SpdmMeasurementBlock> h1SpdmMeasurementBlockList;
/** /**
* Type Header 1 SPDM measurement block. * Type Header 1 SPDM Measurement Block.
*/ */
@Getter private SpdmMeasurementBlock h1SpdmMeasurementBlock;
private String h1SpdmMeasurementBlock = "";
/** ----------- Variables specific to Header Type 2 ----------- /** ----------- Variables specific to Header Type 2 -----------
*/ */
@ -155,6 +159,8 @@ public class DeviceSecurityEventDataHeader {
*/ */
public DeviceSecurityEventDataHeader(final byte[] dSEDbytes) { public DeviceSecurityEventDataHeader(final byte[] dSEDbytes) {
// spdmMeasurementBlockList = new ArrayList<>();
byte[] signatureBytes = new byte[UefiConstants.SIZE_16]; byte[] signatureBytes = new byte[UefiConstants.SIZE_16];
System.arraycopy(dSEDbytes, 0, signatureBytes, 0, UefiConstants.SIZE_16); System.arraycopy(dSEDbytes, 0, signatureBytes, 0, UefiConstants.SIZE_16);
signature = new String(signatureBytes, StandardCharsets.UTF_8) signature = new String(signatureBytes, StandardCharsets.UTF_8)
@ -165,6 +171,9 @@ public class DeviceSecurityEventDataHeader {
UefiConstants.SIZE_2); UefiConstants.SIZE_2);
version = HexUtils.byteArrayToHexString(versionBytes); version = HexUtils.byteArrayToHexString(versionBytes);
// if(version == "0100") {
if (version.equals("0100")) {
byte[] lengthBytes = new byte[UefiConstants.SIZE_2]; byte[] lengthBytes = new byte[UefiConstants.SIZE_2];
System.arraycopy(dSEDbytes, 18, lengthBytes, 0, System.arraycopy(dSEDbytes, 18, lengthBytes, 0,
UefiConstants.SIZE_2); UefiConstants.SIZE_2);
@ -182,12 +191,21 @@ public class DeviceSecurityEventDataHeader {
int deviceTypeInt = HexUtils.leReverseInt(deviceTypeBytes); int deviceTypeInt = HexUtils.leReverseInt(deviceTypeBytes);
deviceType = deviceTypeToString(deviceTypeInt); deviceType = deviceTypeToString(deviceTypeInt);
// // For each measurement block, create a SpdmMeasurementBlock object (can there be many blocks ?)
// byte[] numberOfAlgBytes = new byte[UefiConstants.SIZE_4];
// System.arraycopy(efiSpecId, UefiConstants.OFFSET_24, numberOfAlgBytes, 0, // get the size of the SPDM Measurement Block
// UefiConstants.SIZE_4); byte[] sizeOfSpdmMeasBlockBytes = new byte[UefiConstants.SIZE_2];
// numberOfAlg = HexUtils.leReverseInt(numberOfAlgBytes); System.arraycopy(dSEDbytes, 30, sizeOfSpdmMeasBlockBytes, 0,
// UefiConstants.SIZE_2);
int sizeOfSpdmMeas = HexUtils.leReverseInt(sizeOfSpdmMeasBlockBytes);
int sizeOfSpdmMeasBlock = sizeOfSpdmMeas + 4;
// extract the bytes from the SPDM Measurement Block
byte[] spdmMeasBlockBytes = new byte[sizeOfSpdmMeasBlock];
System.arraycopy(dSEDbytes, 28, spdmMeasBlockBytes, 0,
sizeOfSpdmMeasBlock);
h1SpdmMeasurementBlock = new SpdmMeasurementBlock(spdmMeasBlockBytes);
// byte[] algorithmIDBytes = new byte[UefiConstants.SIZE_2]; // byte[] algorithmIDBytes = new byte[UefiConstants.SIZE_2];
// int algLocation = UefiConstants.SIZE_28; // int algLocation = UefiConstants.SIZE_28;
// for (int i = 0; i < numberOfAlg; i++) { // for (int i = 0; i < numberOfAlg; i++) {
@ -201,6 +219,8 @@ public class DeviceSecurityEventDataHeader {
// } else { // } else {
// cryptoAgile = true; // cryptoAgile = true;
// } // }
}
} }
/** /**
@ -240,7 +260,7 @@ public class DeviceSecurityEventDataHeader {
dsedHeaderInfo += "\n SPDM Device"; dsedHeaderInfo += "\n SPDM Device";
dsedHeaderInfo += "\n Device Type: " + deviceType; dsedHeaderInfo += "\n Device Type: " + deviceType;
dsedHeaderInfo += "\n Device Path: " + devicePath; dsedHeaderInfo += "\n Device Path: " + devicePath;
dsedHeaderInfo += "\n SPDM Measurement Block " + h1SpdmMeasurementBlock; dsedHeaderInfo += "\n SPDM Measurement Block " + h1SpdmMeasurementBlock.toString();
} else if(version.equals("0200")) { } else if(version.equals("0200")) {
dsedHeaderInfo = "tbd"; dsedHeaderInfo = "tbd";
} }

19
HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/spdm/SpdmMeasurementBlock.java
View File

@ -1,9 +1,28 @@
package hirs.utils.tpm.eventlog.spdm; package hirs.utils.tpm.eventlog.spdm;
import lombok.Getter;
public class SpdmMeasurementBlock { public class SpdmMeasurementBlock {
/**
* Measurement Spec.
*/
@Getter
private String measurementSpec = "";
/**
* Measurement value type (such as mutable firmware, etc).
*/
@Getter
private String dmtfSpecMeasurementValueType = "";
/**
* Measurement value (digest).
*/
@Getter
private String dmtfSpecMeasurementValue = "";
public SpdmMeasurementBlock(final byte[] spdmMeasBlockBytes) { public SpdmMeasurementBlock(final byte[] spdmMeasBlockBytes) {
} }
public String toString() { public String toString() {