ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-04-15 06:56:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Preserve messaging through AppraisalStatus object so that PCR mismatches display properly

Browse Source
This commit is contained in:
chubtub 2025-02-13 09:49:33 -05:00
parent 8484a829e0
commit 9ee23b6249
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/validation/FirmwareScvValidator.java
View File

@ -106,9 +106,11 @@ public class FirmwareScvValidator extends SupplyChainCredentialValidator {
if (passed) {
AppraisalStatus rimSignatureStatus = validateRimSignature(baseReferenceManifest,
caCredentialRepository, referenceManifestRepository);
fwStatus = rimSignatureStatus;
if (rimSignatureStatus.getAppStatus() == PASS) {
AppraisalStatus pcrStatus = validatePcrValues(device, hostName, baseReferenceManifest,
measurement, referenceDigestValueRepository, policySettings);
fwStatus = pcrStatus;
if (pcrStatus.getAppStatus() == PASS) {
EventLogMeasurements eventLog = measurement;
eventLog.setOverallValidationResult(PASS);
@ -126,7 +128,6 @@ public class FirmwareScvValidator extends SupplyChainCredentialValidator {
}
}
if (!passed) {
fwStatus = new AppraisalStatus(FAIL, failedString);
if (measurement != null) {
measurement.setOverallValidationResult(fwStatus.getAppStatus());
referenceManifestRepository.save(measurement);