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

[#162] Attribute match fix (#165)

Browse Source 
* Updated code by removing a loop that wasn't necessary.  It was supposed to filter out the deltas but this wasn't needed as the chain was established.

* The debug code was left in, this is now removed.
This commit is contained in:
Cyrus 2019-06-24 13:02:01 -04:00 committed by GitHub
parent a8e2c5cc6e
commit 3208241cc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
HIRS_Utils/src/main/java/hirs/validation/SupplyChainCredentialValidator.java
View File

@ -304,7 +304,6 @@ public final class SupplyChainCredentialValidator implements CredentialValidator
// parse out the provided delta and its specific chain.
Collections.reverse(chainCertificates);
List<PlatformCredential> leafChain = new LinkedList<>();
PlatformCredential dc;
List<ComponentIdentifier> origPcComponents = new LinkedList<>();
for (PlatformCredential pc : chainCertificates) {
@ -315,8 +314,7 @@ public final class SupplyChainCredentialValidator implements CredentialValidator
origPcComponents.addAll(pc.getComponentIdentifiers());
}
} else {
dc = pc;
leafChain.add(dc);
leafChain.add(pc);
}
}
@ -326,24 +324,6 @@ public final class SupplyChainCredentialValidator implements CredentialValidator
leafMap.put(delta.getHolderSerialNumber().toString(), delta);
});
leafChain.clear();
String serialNumber = basePlatformCredential.getSerialNumber().toString();
PlatformCredential tempCred;
// Start with the base serial number, find the delta pointing to it
// and put that first in the list
for (int i = 0; i < leafMap.size(); i++) {
tempCred = leafMap.get(serialNumber);
// this should never be null
if (tempCred != null) {
leafChain.add(i, tempCred);
serialNumber = tempCred.getSerialNumber().toString();
} else {
return new AppraisalStatus(ERROR, String.format("Delta platform search "
+ "for mapping returned null for %s", serialNumber));
}
}
return validateDeltaAttributesChainV2p0(deviceInfoReport,
leafChain, origPcComponents);
}
@ -613,7 +593,6 @@ public final class SupplyChainCredentialValidator implements CredentialValidator
if (ci.isVersion2()) {
ciSerial = ci.getComponentSerial().toString();
ComponentIdentifierV2 ciV2 = (ComponentIdentifierV2) ci;
if (ciV2.isModified()) {
// this won't match
// check it is there