ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-03-11 06:54:14 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Modify validator class so that payload validation failure will stop validation

Browse Source
This commit is contained in:
chubtub 2023-06-14 14:34:13 -04:00
parent 76052764fc
commit f26c7784da
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagValidator.java
View File

@ -137,8 +137,9 @@ public class SwidTagValidator {
si.append("SoftwareIdentity tagId: " + softwareIdentity.getAttribute("tagId") + "\n");
System.out.println(si.toString());
Element directory = (Element) document.getElementsByTagName("Directory").item(0);
validateDirectory(directory);
return validateEnvelopedSignature(document, format);
if (validateDirectory(directory)) {
return validateEnvelopedSignature(document, format);
}
} else {
System.out.println("Invalid xml for validation, please verify " + path);
}
@ -147,13 +148,6 @@ public class SwidTagValidator {
}
private boolean validateEnvelopedSignature(Document doc, String format) {
Element file = (Element) doc.getElementsByTagName("File").item(0);
try {
validateFile(file);
} catch (Exception e) {
System.out.println(e.getMessage());
return false;
}
boolean swidtagValidity = validateSignedXMLDocument(doc, format);
if (swidtagValidity) {
System.out.println("Signature core validity: true");