From 0b91c1e39adb3159c158c79a4202e5dc62edb51b Mon Sep 17 00:00:00 2001
From: Cyrus <24922493+cyrus-dev@users.noreply.github.com>
Date: Mon, 4 Apr 2022 14:21:44 -0400
Subject: [PATCH] Updated the link from a failed validation to the base rim
 when the path for the measurement can't be found.

---
 .../service/SupplyChainValidationServiceImpl.java              | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/service/SupplyChainValidationServiceImpl.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/service/SupplyChainValidationServiceImpl.java
index 76ad5bcd..fe7b544d 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/service/SupplyChainValidationServiceImpl.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/service/SupplyChainValidationServiceImpl.java
@@ -445,6 +445,7 @@ public class SupplyChainValidationServiceImpl implements SupplyChainValidationSe
                             passed = false;
                             fwStatus = new AppraisalStatus(FAIL,
                                     "Firmware validation failed: invalid certificate path.");
+                            validationObject = baseReferenceManifest;
                         }
                     } catch (IOException e) {
                         LOGGER.error("Error getting X509 cert from manager: " + e.getMessage());
@@ -467,7 +468,7 @@ public class SupplyChainValidationServiceImpl implements SupplyChainValidationSe
                 }
             }
 
-            if (signingCert == null) {
+            if (passed && signingCert == null) {
                 passed = false;
                 fwStatus = new AppraisalStatus(FAIL,
                         "Firmware validation failed: signing cert not found.");