ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-04-07 19:34:27 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Log an error instead of throwing an exception when a signing key cannot be located in the provided truststore

Browse Source
This commit is contained in:
chubtub 2024-02-01 10:15:54 -05:00
parent ed44f7ad61
commit 2a88b22ae1
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
HIRS_Utils/src/main/java/hirs/utils/rim/ReferenceManifestValidator.java
View File

@ -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;

6
tools/tcg_rim_tool/src/main/java/hirs/swid/Main.java
View File

@ -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);