From 300cae3950a4e3f3f3704bca92e0d997b1affc30 Mon Sep 17 00:00:00 2001
From: Cyrus <24922493+cyrus-dev@users.noreply.github.com>
Date: Thu, 29 Feb 2024 07:53:21 -0500
Subject: [PATCH] Changed the branch naming and addressed a failed unit test. 
 When the value of the platform version is null, the unit test was failing.

---
 .../persist/validation/CertificateAttributeScvValidator.java | 3 +++
 .../validation/SupplyChainCredentialValidatorTest.java       | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/validation/CertificateAttributeScvValidator.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/validation/CertificateAttributeScvValidator.java
index 2f7198b4..ce4c8c09 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/validation/CertificateAttributeScvValidator.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/validation/CertificateAttributeScvValidator.java
@@ -1102,6 +1102,9 @@ public class CertificateAttributeScvValidator extends SupplyChainCredentialValid
      * @return true if they equal Not Specified or Unknown
      */
     public static boolean isNotSpecifiedOrUnknown(final String versionNumber) {
+        if(versionNumber == null) {
+            return true;
+        }
         String fieldValue = versionNumber.toLowerCase();
 
         return fieldValue.equals(DeviceInfoEnums.NOT_SPECIFIED.toLowerCase())
diff --git a/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/validation/SupplyChainCredentialValidatorTest.java b/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/validation/SupplyChainCredentialValidatorTest.java
index dcf25d80..e6d5fd7d 100644
--- a/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/validation/SupplyChainCredentialValidatorTest.java
+++ b/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/validation/SupplyChainCredentialValidatorTest.java
@@ -1355,8 +1355,9 @@ public class SupplyChainCredentialValidatorTest {
         result = CertificateAttributeScvValidator
                 .validatePlatformCredentialAttributesV2p0(platformCredential,
                         deviceInfoReport);
-        assertEquals(AppraisalStatus.Status.FAIL, result.getAppStatus());
-        assertEquals("Platform version did not match\n", result.getMessage());
+        assertEquals(AppraisalStatus.Status.PASS, result.getAppStatus());
+        assertEquals(SupplyChainCredentialValidator.PLATFORM_ATTRIBUTES_VALID,
+                result.getMessage());
 
         platformCredential = setupMatchingPlatformCredential(deviceInfoReport);
         result = CertificateAttributeScvValidator