- * typedef struct tdDEVICE_SECURITY_EVENT_DATA_DEVICE_CONTEXT { + * typedef union tdDEVICE_SECURITY_EVENT_DATA_DEVICE_CONTEXT { * DEVICE_SECURITY_EVENT_DATA_PCI_CONTEXT PciContext; * DEVICE_SECURITY_EVENT_DATA_USB_CONTEXT UsbContext; * } DEVICE_SECURITY_EVENT_DATA_DEVICE_CONTEXT; *
*/ -public class DeviceSecurityEventDataDeviceContext { +public abstract class DeviceSecurityEventDataDeviceContext { + +// /** +// * SPDM Measurement Block. +// */ +// private DeviceSecurityEventDataPciContext deviceSecurityEventDataPciContext = null; /** - * SPDM Measurement Block. + * PCI Version. */ - private DeviceSecurityEventDataPciContext deviceSecurityEventDataPciContext = null; + @Getter + private int version = 0; + /** + * PCI Length. + */ + @Getter + private int length = 0; /** * DeviceSecurityEventDataDeviceContext Constructor. @@ -33,28 +44,28 @@ public class DeviceSecurityEventDataDeviceContext { */ public DeviceSecurityEventDataDeviceContext(final byte[] dSEDdeviceContextBytes) { - byte[] dSEDpciContextLengthBytes = new byte[2]; - System.arraycopy(dSEDdeviceContextBytes, 2, dSEDpciContextLengthBytes, 0, 2); - int dSEDpciContextLength = HexUtils.leReverseInt(dSEDpciContextLengthBytes); + byte[] pciVersionBytes = new byte[2]; + System.arraycopy(dSEDdeviceContextBytes, 0, pciVersionBytes, 0, 2); + version = HexUtils.leReverseInt(pciVersionBytes); - byte[] dSEDpciContextBytes = new byte[dSEDpciContextLength]; - System.arraycopy(dSEDdeviceContextBytes, 0, dSEDpciContextBytes, 0, dSEDpciContextLength); - deviceSecurityEventDataPciContext = new DeviceSecurityEventDataPciContext(dSEDpciContextBytes); - - //TODO add USB context + byte[] pciLengthBytes = new byte[2]; + System.arraycopy(dSEDdeviceContextBytes, 2, pciLengthBytes, 0, 2); + length = HexUtils.leReverseInt(pciLengthBytes); } /** - * Returns a human readable description of the data within this structure. + * Returns a human readable description of the data common to device context structures. * * @return a description of this structure.. */ - public String toString() { - String dSEDdeviceContextInfo = ""; + public String deviceContextCommonInfoToString() { + String dSEDdeviceContextCommonInfo = ""; - dSEDdeviceContextInfo += deviceSecurityEventDataPciContext.toString(); + dSEDdeviceContextCommonInfo += "\n DeviceSecurityEventData - Device Info"; + dSEDdeviceContextCommonInfo += "\n Device Structure Version = " + version; - return dSEDdeviceContextInfo; + return dSEDdeviceContextCommonInfo; } + } diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataHeader.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataHeader.java index c8a9ecf7..bef56679 100644 --- a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataHeader.java +++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataHeader.java @@ -110,7 +110,7 @@ public class DeviceSecurityEventDataHeader extends DeviceSecurityEventDataHeader public String toString() { String dsedHeaderInfo = ""; - dsedHeaderInfo += headerBaseToString(); + dsedHeaderInfo += headerCommonInfoToString(); String spdmHashAlgoStr = SpdmHa.tcgAlgIdToString(spdmHashAlgo); dsedHeaderInfo += "\n SPDM Hash Algorithm = " + spdmHashAlgoStr; dsedHeaderInfo += "\n SPDM Measurement Block:"; diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataHeaderBase.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataHeaderBase.java index 3dfe8c42..cc257cab 100644 --- a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataHeaderBase.java +++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataHeaderBase.java @@ -189,19 +189,19 @@ public abstract class DeviceSecurityEventDataHeaderBase { * * @return a description of this structure. */ - public String headerBaseToString() { - String dsedHeaderInfo = ""; + public String headerCommonInfoToString() { + String dsedHeaderCommonInfo = ""; - dsedHeaderInfo += "\n SPDM Device Type = " + deviceTypeToString(deviceType); + dsedHeaderCommonInfo += "\n SPDM Device Type = " + deviceTypeToString(deviceType); if (devicePathValid) { - dsedHeaderInfo += "\n SPDM Device Path =\n"; - dsedHeaderInfo += devicePath; + dsedHeaderCommonInfo += "\n SPDM Device Path =\n"; + dsedHeaderCommonInfo += devicePath; } else { - dsedHeaderInfo += "\n SPDM Device Path = Unknown or invalid"; + dsedHeaderCommonInfo += "\n SPDM Device Path = Unknown or invalid"; } - return dsedHeaderInfo; + return dsedHeaderCommonInfo; } } diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataPciContext.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataPciContext.java index 02502e7c..742c8b5d 100644 --- a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataPciContext.java +++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataPciContext.java @@ -41,18 +41,8 @@ import java.util.List; * https://admin.pci-ids.ucw.cz/read/PD/ * The revision ID is controlled by the vendor and cannot be looked up. */ -public class DeviceSecurityEventDataPciContext { +public class DeviceSecurityEventDataPciContext extends DeviceSecurityEventDataDeviceContext { - /** - * PCI Version. - */ - @Getter - private int pciVersion = 0; - /** - * PCI Length. - */ - @Getter - private int pciLength = 0; /** * PCI Vendor ID. */ @@ -91,13 +81,7 @@ public class DeviceSecurityEventDataPciContext { */ public DeviceSecurityEventDataPciContext(final byte[] dSEDpciContextBytes) { - byte[] pciVersionBytes = new byte[2]; - System.arraycopy(dSEDpciContextBytes, 0, pciVersionBytes, 0, 2); - pciVersion = HexUtils.leReverseInt(pciVersionBytes); - - byte[] pciLengthBytes = new byte[2]; - System.arraycopy(dSEDpciContextBytes, 2, pciLengthBytes, 0, 2); - pciLength = HexUtils.leReverseInt(pciLengthBytes); + super(dSEDpciContextBytes); byte[] pciVendorIdBytes = new byte[2]; System.arraycopy(dSEDpciContextBytes, 4, pciVendorIdBytes, 0, 2); @@ -133,9 +117,8 @@ public class DeviceSecurityEventDataPciContext { public String toString() { String dSEDpciContextInfo = ""; - dSEDpciContextInfo += "\n DeviceSecurityEventData - PCI Context"; - dSEDpciContextInfo += "\n Version = " + pciVersion; - dSEDpciContextInfo += "\n Length = " + pciLength; + dSEDpciContextInfo += deviceContextCommonInfoToString(); + dSEDpciContextInfo += "\n Device Type = PCI"; dSEDpciContextInfo += "\n VendorID = 0x" + pciVendorId; dSEDpciContextInfo += "\n DeviceID = 0x" + pciDeviceId; dSEDpciContextInfo += "\n RevisionID = 0x" + pciRevisionId;