diff --git a/HIRS_Utils/src/main/java/hirs/utils/rim/ReferenceManifestValidator.java b/HIRS_Utils/src/main/java/hirs/utils/rim/ReferenceManifestValidator.java index 112c7168..cb3fdd48 100644 --- a/HIRS_Utils/src/main/java/hirs/utils/rim/ReferenceManifestValidator.java +++ b/HIRS_Utils/src/main/java/hirs/utils/rim/ReferenceManifestValidator.java @@ -257,6 +257,11 @@ public class ReferenceManifestValidator { X509Certificate signingCert = null; try { signingCert = getCertFromTruststore(); + if (signingCert == null) { + log.error("Unable to locate the signing cert in the provided truststore " + + trustStoreFile); + return false; + } } catch (IOException e) { log.warn("Error while parsing signing cert from truststore: " + e.getMessage()); return false; diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/Main.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/Main.java index 688be2fb..d9e2bcc1 100644 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/Main.java +++ b/tools/tcg_rim_tool/src/main/java/hirs/swid/Main.java @@ -53,7 +53,11 @@ public class Main { System.out.println("A single cert cannot be used for verification. " + "The signing cert will be searched for in the trust store."); } - validator.validateSwidtagFile(verifyFile); + if (validator.validateSwidtagFile(verifyFile)) { + System.out.println("Successfully verified " + verifyFile); + } else { + System.out.println("Failed to verify " + verifyFile); + } } else { System.out.println("Need a RIM file to validate!"); System.exit(1);