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 4927b4a5..c5c14a11 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 @@ -219,7 +219,7 @@ public class UefiSignatureList { } else { sigInfo.append(" UEFI Signature List Type = " + signatureType.toString() + "\n"); - sigInfo.append(" Number of items (certs, hashes, etc) = " + numberOfCerts + "\n"); + sigInfo.append(" Number of Certs or Hashes in UEFI Signature List = " + numberOfCerts + "\n"); for (int i = 0; i < sigList.size(); i++) { UefiSignatureData certData = sigList.get(i); 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 3760930f..f57e418e 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 @@ -201,7 +201,15 @@ public class UefiVariable { efiVariable.append("Data not provided "); } } + + // Signature List output (if there are any Signature Lists) + if (certSuperList.size() > 0){ + efiVariable.append("Number of UEFI Signature Lists = " + certSuperList.size() + "\n"); + } + int certSuperListCnt = 1; for (UefiSignatureList uefiSigList : certSuperList) { + efiVariable.append("UEFI Signature List # " + certSuperListCnt++ + " of " + + certSuperList.size() + ":\n"); efiVariable.append(uefiSigList.toString()); } if(invalidSignatureListEncountered) { @@ -209,6 +217,7 @@ public class UefiVariable { efiVariable.append("*** Encountered invalid Signature Type - " + "Stopped processing of this event data\n"); } + return efiVariable.toString(); }