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

Took out initalizing TPMMeasurementRecord in PCRPolicy's constructor. This was likely throwing the DecoderException which caused the 404 error in the ACA.

Browse Source
This commit is contained in:
Cyrus 2020-08-26 11:13:00 -04:00
parent 905f12052d
commit 0f3eb1b5d0
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
HIRS_Utils/src/main/java/hirs/data/persist/PCRPolicy.java
View File

@ -6,14 +6,12 @@ import static org.apache.logging.log4j.LogManager.getLogger;
import hirs.data.persist.tpm.PcrComposite;
import hirs.data.persist.tpm.PcrInfoShort;
import org.apache.commons.codec.DecoderException;
import hirs.data.persist.tpm.PcrSelection;
import org.apache.logging.log4j.Logger;
import java.io.UnsupportedEncodingException;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
* The class handles the flags that ignore certain PCRs for validation.
@ -38,28 +36,23 @@ public final class PCRPolicy extends Policy {
private boolean linuxOs = false;
private String[] baselinePcrs;
private List<TPMMeasurementRecord> measurements;
/**
* Default constructor.
*/
public PCRPolicy() {
baselinePcrs = new String[TPMMeasurementRecord.MAX_PCR_ID + 1];
measurements = new ArrayList<>(baselinePcrs.length);
}
/**
* Constructor to parse PCR values.
*
* @param pcrValues RIM provided baseline PCRs
* @throws DecoderException if byte array could not be decoded.
*/
public PCRPolicy(final String[] pcrValues) throws DecoderException {
public PCRPolicy(final String[] pcrValues) {
baselinePcrs = new String[TPMMeasurementRecord.MAX_PCR_ID + 1];
measurements = new ArrayList<>(baselinePcrs.length);
for (int i = 0; i <= TPMMeasurementRecord.MAX_PCR_ID; i++) {
baselinePcrs[i] = pcrValues[i];
measurements.add(new TPMMeasurementRecord(i, pcrValues[i]));
}
}
@ -101,10 +94,15 @@ public final class PCRPolicy extends Policy {
*/
public boolean validateQuote(final byte[] tpmQuote) {
boolean validated = false;
short localityAtRelease = 0;
PcrComposite pcrComposite = new PcrComposite(this.measurements);
PcrInfoShort pcrInfoShort = new PcrInfoShort(localityAtRelease,
TPMMeasurementRecord[] measurements = new TPMMeasurementRecord[baselinePcrs.length];
PcrSelection pcrSelection = new PcrSelection(PcrSelection.ALL_PCRS_ON);
PcrComposite pcrComposite = new PcrComposite(
pcrSelection,
Arrays.asList(measurements));
PcrInfoShort pcrInfoShort = new PcrInfoShort(pcrSelection,
localityAtRelease,
tpmQuote, pcrComposite);
try {

7
HIRS_Utils/src/main/java/hirs/data/persist/tpm/PcrSelection.java
View File

@ -30,6 +30,10 @@ public class PcrSelection {
private static final Logger LOGGER = LogManager
.getLogger(PcrSelection.class);
private static final int MAX_SIZE_PCR_ARRAY = 3;
/**
* All PCRs are on.
*/
public static final int ALL_PCRS_ON = 0xffffff;
@XmlAttribute(name = "PcrSelect", required = true)
private final byte[] pcrSelect;
@ -76,8 +80,7 @@ public class PcrSelection {
* long value representing the bits to be selected
*/
public PcrSelection(final long pcrSelectLong) {
final int allPCRsOn = 0xffffff;
if (pcrSelectLong > allPCRsOn) {
if (pcrSelectLong > ALL_PCRS_ON) {
LOGGER.error("pcrSelect long value must be less than 3 bytes");
throw new InvalidParameterException("pcrSelect");
}