From d5fcd06902f3ae211cf2eb41b1d43e8f66efb00d Mon Sep 17 00:00:00 2001
From: chubtub <43381989+chubtub@users.noreply.github.com>
Date: Tue, 16 Nov 2021 16:59:56 -0500
Subject: [PATCH] Add error handling to clarify endorsement validation error

---
 .../SupplyChainCredentialValidator.java           | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/HIRS_Utils/src/main/java/hirs/validation/SupplyChainCredentialValidator.java b/HIRS_Utils/src/main/java/hirs/validation/SupplyChainCredentialValidator.java
index 752cca41..cc1d5cac 100644
--- a/HIRS_Utils/src/main/java/hirs/validation/SupplyChainCredentialValidator.java
+++ b/HIRS_Utils/src/main/java/hirs/validation/SupplyChainCredentialValidator.java
@@ -1629,11 +1629,18 @@ public final class SupplyChainCredentialValidator implements CredentialValidator
         try {
             cert.verify(signingCert.getPublicKey(), BouncyCastleProvider.PROVIDER_NAME);
             return true;
-        } catch (InvalidKeyException | CertificateException | NoSuchAlgorithmException
-                | NoSuchProviderException | SignatureException e) {
-            LOGGER.error("Exception thrown while verifying certificate", e);
-            return false;
+        } catch (InvalidKeyException e) {
+            LOGGER.warn("Incorrect key given to validate this cert's signature");
+        } catch (CertificateException e) {
+            LOGGER.warn("Encoding error while validating this cert's signature");
+        } catch (NoSuchAlgorithmException e) {
+            LOGGER.warn("Unsupported signature algorithm found during validation");
+        } catch (NoSuchProviderException e) {
+            LOGGER.warn("Incorrect provider for cert signature validation");
+        } catch (SignatureException e) {
+            LOGGER.warn("Exception thrown while verifying certificate", e);
         }
+        return false;
 
     }