From 766d1eb3e0e6b52e95ae4a9301db5b419f0b0a00 Mon Sep 17 00:00:00 2001 From: iadgovuser58 <124906646+iadgovuser58@users.noreply.github.com> Date: Mon, 29 Apr 2024 09:17:18 -0400 Subject: [PATCH] changed name of DeviceSecurityEventData parent and ..HEADER parent to make the naming more clear --- ...ecurityEventDataBase.java => DeviceSecurityEvent.java} | 8 ++------ .../tpm/eventlog/events/DeviceSecurityEventData.java | 2 +- .../tpm/eventlog/events/DeviceSecurityEventData2.java | 2 +- .../eventlog/events/DeviceSecurityEventDataHeader.java | 2 +- .../eventlog/events/DeviceSecurityEventDataHeader2.java | 2 +- ...DataHeaderBase.java => DeviceSecurityEventHeader.java} | 6 +++--- 6 files changed, 9 insertions(+), 13 deletions(-) rename HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/{DeviceSecurityEventDataBase.java => DeviceSecurityEvent.java} (95%) rename HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/{DeviceSecurityEventDataHeaderBase.java => DeviceSecurityEventHeader.java} (97%) diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataBase.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEvent.java similarity index 95% rename from HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataBase.java rename to HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEvent.java index d0e2389e..0e97f8a1 100644 --- a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataBase.java +++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEvent.java @@ -1,11 +1,7 @@ package hirs.utils.tpm.eventlog.events; -import hirs.utils.HexUtils; -import hirs.utils.tpm.eventlog.uefi.UefiConstants; import lombok.Getter; -import java.nio.charset.StandardCharsets; - /** * Abstract base class to process the DEVICE_SECURITY_EVENT_DATA or ..DATA2 event. @@ -52,7 +48,7 @@ import java.nio.charset.StandardCharsets; * even though the spec says both are in the data structure. If it is only 1, though, there's no * method to tell them apart. */ -public abstract class DeviceSecurityEventDataBase { +public abstract class DeviceSecurityEvent { /** * Human readable description of the data within the @@ -65,7 +61,7 @@ public abstract class DeviceSecurityEventDataBase { * DeviceSecurityEventData Default Constructor. * */ - public DeviceSecurityEventDataBase() { + public DeviceSecurityEvent() { } 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 2abd5be3..4f996548 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 @@ -13,7 +13,7 @@ import java.io.UnsupportedEncodingException; * } DEVICE_SECURITY_EVENT_DATA; *

*/ -public class DeviceSecurityEventData extends DeviceSecurityEventDataBase { +public class DeviceSecurityEventData extends DeviceSecurityEvent { /** * DeviceSecurityEventDataHeader Object. diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventData2.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventData2.java index 076bad86..014b6fe0 100644 --- a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventData2.java +++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventData2.java @@ -14,7 +14,7 @@ import lombok.Getter; * } DEVICE_SECURITY_EVENT_DATA2; *

*/ -public class DeviceSecurityEventData2 extends DeviceSecurityEventDataBase { +public class DeviceSecurityEventData2 extends DeviceSecurityEvent { /** * DeviceSecurityEventDataHeader Object. 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 e46c48ab..9a598000 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 @@ -28,7 +28,7 @@ import java.io.UnsupportedEncodingException; *

* Assumption: there is only 1 SpdmMeasurementBlock per event. Need more test patterns to verify. */ -public class DeviceSecurityEventDataHeader extends DeviceSecurityEventDataHeaderBase { +public class DeviceSecurityEventDataHeader extends DeviceSecurityEventHeader { /** * Event data length. diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataHeader2.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataHeader2.java index bf416158..0e372ea8 100644 --- a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataHeader2.java +++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataHeader2.java @@ -1,7 +1,7 @@ package hirs.utils.tpm.eventlog.events; // Placeholder for Header2 data structure. -public class DeviceSecurityEventDataHeader2 extends DeviceSecurityEventDataHeaderBase { +public class DeviceSecurityEventDataHeader2 extends DeviceSecurityEventHeader { public DeviceSecurityEventDataHeader2(final byte[] dSEDbytes) { 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/DeviceSecurityEventHeader.java similarity index 97% rename from HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataHeaderBase.java rename to HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventHeader.java index 818395e5..c254eec3 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/DeviceSecurityEventHeader.java @@ -50,7 +50,7 @@ import java.nio.charset.StandardCharsets; * DevicePath *

*/ -public abstract class DeviceSecurityEventDataHeaderBase { +public abstract class DeviceSecurityEventHeader { /** * Contains the size (in bytes) of the header. @@ -105,7 +105,7 @@ public abstract class DeviceSecurityEventDataHeaderBase { /** * DeviceSecurityEventDataHeaderBase Default Constructor. */ - public DeviceSecurityEventDataHeaderBase() { + public DeviceSecurityEventHeader() { } @@ -114,7 +114,7 @@ public abstract class DeviceSecurityEventDataHeaderBase { * * @param dSEDbytes byte array holding the DeviceSecurityEventData. */ - public DeviceSecurityEventDataHeaderBase(final byte[] dSEDbytes) { + public DeviceSecurityEventHeader(final byte[] dSEDbytes) { byte[] signatureBytes = new byte[UefiConstants.SIZE_16]; System.arraycopy(dSEDbytes, 0, signatureBytes, 0, UefiConstants.SIZE_16);