From 2b198816b681c41ac5bdd7a9517f9525e641bc74 Mon Sep 17 00:00:00 2001
From: iadgovuser58 <124906646+iadgovuser58@users.noreply.github.com>
Date: Mon, 8 Jul 2024 10:16:32 -0400
Subject: [PATCH] fixes/minor changes

---
 HIRS_Utils/src/main/java/hirs/utils/PciIds.java               | 4 ++--
 .../utils/tpm/eventlog/events/DeviceSecurityEventHeader.java  | 2 +-
 .../java/hirs/utils/tpm/eventlog/uefi/UefiDevicePath.java     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/HIRS_Utils/src/main/java/hirs/utils/PciIds.java b/HIRS_Utils/src/main/java/hirs/utils/PciIds.java
index 1449b155..6bac767b 100644
--- a/HIRS_Utils/src/main/java/hirs/utils/PciIds.java
+++ b/HIRS_Utils/src/main/java/hirs/utils/PciIds.java
@@ -180,8 +180,8 @@ public final class PciIds {
         String classCode = refClassCode;
         if (classCode != null && classCode.trim().matches("^[0-9A-Fa-f]{6}$")) {
             String deviceClass = classCode.substring(0,2).toLowerCase();
-            String deviceSubclass = classCode.substring(2,2).toLowerCase();
-            String programInterface = classCode.substring(4,2).toLowerCase();
+            String deviceSubclass = classCode.substring(2,4).toLowerCase();
+            String programInterface = classCode.substring(4,6).toLowerCase();
             translatedClassCode.add(deviceClass);
             translatedClassCode.add(deviceSubclass);
             translatedClassCode.add(programInterface);
diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventHeader.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventHeader.java
index 210f4f86..5e60f607 100644
--- a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventHeader.java
+++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventHeader.java
@@ -208,7 +208,7 @@ public abstract class DeviceSecurityEventHeader {
 
         dsedHeaderCommonInfo += "\n   SPDM Device Type = " + deviceTypeToString(deviceType);
         if (devicePathValid) {
-            dsedHeaderCommonInfo += "\n   SPDM Device Path =\n";
+            dsedHeaderCommonInfo += "\n   SPDM Device Path:\n";
             dsedHeaderCommonInfo += devicePath;
         }
         else {
diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiDevicePath.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiDevicePath.java
index adcec477..bd647deb 100644
--- a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiDevicePath.java
+++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiDevicePath.java
@@ -116,7 +116,7 @@ public class UefiDevicePath {
      */
     private String processDev(final byte[] path, final int offset)
             throws UnsupportedEncodingException {
-        String devInfo = "    ";
+        String devInfo = "      ";
         int devPath = path[offset];
         byte unknownSubType = path[offset + UefiConstants.OFFSET_1];
         switch (path[0 + offset]) {