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

debugging SLF4J warning

Browse Source
This commit is contained in:
iadgovuser58 2024-08-09 13:50:15 -04:00
parent 1324edcfcb
commit 6f0553fe3f
4 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataPciContext.java
View File

@ -113,21 +113,21 @@ public class DeviceSecurityEventDataPciContext extends DeviceSecurityEventDataDe
dSEDpciContextInfo += super.toString();
dSEDpciContextInfo += " Device Type = PCI\n";
dSEDpciContextInfo += " Vendor = " + translateVendor(vendorId) + "\n";
dSEDpciContextInfo += " Device = " + translateDevice(vendorId, deviceId) + "\n";
dSEDpciContextInfo += " RevisionID = " + revisionId + "\n";
// dSEDpciContextInfo += " Vendor = " + translateVendor(vendorId) + "\n";
// dSEDpciContextInfo += " Device = " + translateDevice(vendorId, deviceId) + "\n";
// dSEDpciContextInfo += " RevisionID = " + revisionId + "\n";
List<String> classCodeList = translateDeviceClass(classCode);
dSEDpciContextInfo += " Device Class: \n";
if(classCodeList.size() == 3) {
dSEDpciContextInfo += " Class = " + classCodeList.get(0) + "\n";
dSEDpciContextInfo += " Subclass = " + classCodeList.get(1) + "\n";
dSEDpciContextInfo += " Programming Interface = " + classCodeList.get(2) + "\n";
} else {
dSEDpciContextInfo += " ** Class code could not be determined **";
}
dSEDpciContextInfo += " SubsystemVendor = " + translateVendor(subsystemVendorId) + "\n";
dSEDpciContextInfo += " Subsystem = " + translateDevice(subsystemVendorId, subsystemId) + "\n";
// List<String> classCodeList = translateDeviceClass(classCode);
// dSEDpciContextInfo += " Device Class: \n";
// if(classCodeList.size() == 3) {
// dSEDpciContextInfo += " Class = " + classCodeList.get(0) + "\n";
// dSEDpciContextInfo += " Subclass = " + classCodeList.get(1) + "\n";
// dSEDpciContextInfo += " Programming Interface = " + classCodeList.get(2) + "\n";
// } else {
// dSEDpciContextInfo += " ** Class code could not be determined **";
// }
// dSEDpciContextInfo += " SubsystemVendor = " + translateVendor(subsystemVendorId) + "\n";
// dSEDpciContextInfo += " Subsystem = " + translateDevice(subsystemVendorId, subsystemId) + "\n";
return dSEDpciContextInfo;
}

28
HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/EvEfiSpdmDeviceSecurityEvent.java
View File

@ -69,25 +69,25 @@ public class EvEfiSpdmDeviceSecurityEvent {
spdmInfo = " Signature = SPDM Device Sec2\n";
// if (dsedVersion.equals("0200")) {
// dsed = new DeviceSecurityEventData2(eventData);
// spdmInfo += dsed.toString();
// }
// else {
// spdmInfo += " Incompatible version for DeviceSecurityEventData2: " + dsedVersion + "\n";
// }
if (dsedVersion.equals("0200")) {
dsed = new DeviceSecurityEventData2(eventData);
spdmInfo += dsed.toString();
}
else {
spdmInfo += " Incompatible version for DeviceSecurityEventData2: " + dsedVersion + "\n";
}
}
else if (dsedSignature.contains("SPDM Device Sec")) { // implies Device Security event
spdmInfo = " Signature = SPDM Device Sec\n";
// if (dsedVersion.equals("0100")) {
// dsed = new DeviceSecurityEventData(eventData);
// spdmInfo += dsed.toString();
// }
// else {
// spdmInfo += " Incompatible version for DeviceSecurityEventData: " + dsedVersion + "\n";
// }
if (dsedVersion.equals("0100")) {
dsed = new DeviceSecurityEventData(eventData);
spdmInfo += dsed.toString();
}
else {
spdmInfo += " Incompatible version for DeviceSecurityEventData: " + dsedVersion + "\n";
}
}
else {
spdmInfo = " Signature = Undetermined value: " + dsedSignature + "\n";

16
HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/NvIndexInstanceEventLogData.java
View File

@ -81,14 +81,14 @@ public class NvIndexInstanceEventLogData {
nvIndexInstanceInfo += " Signature = SPDM Device Sec2\n";
// if (dsedVersion.equals("0200")) {
// dsed = new DeviceSecurityEventData2(dsedEventData);
// nvIndexInstanceInfo += dsed.toString();
// }
// else {
// nvIndexInstanceInfo += " Incompatible version for DeviceSecurityEventData2: "
// + dsedVersion + "\n";
// }
if (dsedVersion.equals("0200")) {
dsed = new DeviceSecurityEventData2(dsedEventData);
nvIndexInstanceInfo += dsed.toString();
}
else {
nvIndexInstanceInfo += " Incompatible version for DeviceSecurityEventData2: "
+ dsedVersion + "\n";
}
}
else {
nvIndexInstanceInfo = " Signature error: should be \'SPDM Device Sec2\' but is "

8
tools/tcg_eventlog_tool/src/main/java/hirs/tcg_eventlog/Main.java
View File

@ -1,5 +1,9 @@
package hirs.tcg_eventlog;
import hirs.utils.HexUtils;
import hirs.utils.tpm.eventlog.TCGEventLog;
import hirs.utils.tpm.eventlog.TpmPcrEvent;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.charset.Charset;
@ -12,10 +16,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import hirs.utils.tpm.eventlog.TCGEventLog;
import hirs.utils.tpm.eventlog.TpmPcrEvent;
import hirs.utils.HexUtils;
import static hirs.utils.tpm.eventlog.uefi.UefiConstants.FILESTATUS_FROM_CODE;
import static hirs.utils.tpm.eventlog.uefi.UefiConstants.FILESTATUS_NOT_ACCESSIBLE;