From d087eba569f6e20544d378f350a94a530cd30000 Mon Sep 17 00:00:00 2001 From: iadgovuser58 <124906646+iadgovuser58@users.noreply.github.com> Date: Mon, 3 Jun 2024 18:19:57 -0400 Subject: [PATCH] cleaning up comments --- HIRS_Utils/src/main/java/hirs/utils/JsonUtils.java | 5 +---- .../java/hirs/utils/tpm/eventlog/TpmPcrEvent.java | 1 - .../hirs/utils/tpm/eventlog/uefi/UefiGuid.java | 14 -------------- .../utils/tpm/eventlog/uefi/UefiSignatureList.java | 4 ---- .../hirs/utils/tpm/eventlog/uefi/UefiVariable.java | 1 - 5 files changed, 1 insertion(+), 24 deletions(-) diff --git a/HIRS_Utils/src/main/java/hirs/utils/JsonUtils.java b/HIRS_Utils/src/main/java/hirs/utils/JsonUtils.java index ada0e133..f2874162 100644 --- a/HIRS_Utils/src/main/java/hirs/utils/JsonUtils.java +++ b/HIRS_Utils/src/main/java/hirs/utils/JsonUtils.java @@ -3,17 +3,14 @@ package hirs.utils; import com.eclipsesource.json.Json; import com.eclipsesource.json.JsonObject; import hirs.utils.tpm.eventlog.uefi.UefiGuid; -import hirs.utils.xjc.Resource; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.log4j.Log4j2; -import java.io.BufferedReader; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -101,7 +98,7 @@ public final class JsonUtils { return jsonObject; } - + /** * Getter for the JSON Object that is associated with the elementName value * mapped in the associated JSON file. 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 0b62726c..aac18480 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 @@ -34,7 +34,6 @@ import java.security.cert.CertificateException; import java.util.Arrays; import static hirs.utils.tpm.eventlog.uefi.UefiConstants.FILESTATUS_FROM_FILESYSTEM; -import static hirs.utils.tpm.eventlog.uefi.UefiConstants.FILESTATUS_NOT_ACCESSIBLE; /** * Class to process a TCG_PCR_EVENT. diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiGuid.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiGuid.java index e34c0384..464b5a85 100644 --- a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiGuid.java +++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiGuid.java @@ -1,27 +1,13 @@ package hirs.utils.tpm.eventlog.uefi; -import com.eclipsesource.json.Json; import com.eclipsesource.json.JsonObject; import hirs.utils.HexUtils; import hirs.utils.JsonUtils; -import hirs.utils.rim.ReferenceManifestValidator; import lombok.Getter; -import org.apache.commons.io.IOUtils; -import javax.xml.transform.Source; -import javax.xml.transform.stream.StreamSource; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; import java.math.BigInteger; -import java.net.URISyntaxException; -import java.net.URL; -import java.nio.charset.StandardCharsets; import java.nio.file.FileSystems; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.UUID; import static hirs.utils.tpm.eventlog.uefi.UefiConstants.FILESTATUS_FROM_CODE; diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiSignatureList.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiSignatureList.java index bca52b15..e1a00c57 100644 --- a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiSignatureList.java +++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiSignatureList.java @@ -121,10 +121,6 @@ public class UefiSignatureList { lists.read(guid); signatureType = new UefiGuid(guid); vendorTableFileStatus = signatureType.getVendorTableFileStatus(); -// if(signatureType.isVendorTableReferenceHandleEmpty()) { -// bVendorTableFileInaccessbile = true; -// vendorTableFileStatus = FILE_NOT_ACCESSIBLE; -// } // if signatureType is invalid, don't even process any of the data // however, if signatureTYpe is valid, but some of the data later on is invalid, that will diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiVariable.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiVariable.java index 7aeeefc3..ea01c189 100644 --- a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiVariable.java +++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiVariable.java @@ -12,7 +12,6 @@ import java.security.cert.CertificateException; import java.util.ArrayList; import java.util.List; -import static hirs.utils.tpm.eventlog.uefi.UefiConstants.FILESTATUS_FROM_CODE; import static hirs.utils.tpm.eventlog.uefi.UefiConstants.FILESTATUS_FROM_FILESYSTEM; import static hirs.utils.tpm.eventlog.uefi.UefiConstants.FILESTATUS_NOT_ACCESSIBLE;