ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-01-18 02:39:56 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch 'issue-395' of github.com:nsacyber/HIRS into issue-395

Browse Source
This commit is contained in:
chubtub 2022-02-17 16:55:59 -05:00
commit bf989bbee7
5 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
HIRS_AttestationCA/src/main/java/hirs/attestationca/AbstractAttestationCertificateAuthority.java
View File

@ -1056,6 +1056,12 @@ public abstract class AbstractAttestationCertificateAuthority
false, false, tpe.getEventContent());
this.referenceEventManager.saveValue(rdv);
}
} catch (CertificateException e) {
e.printStackTrace();
} catch (NoSuchAlgorithmException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
}
}

4
HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/Page.java
View File

@ -57,8 +57,8 @@ public enum Page {
/**
* Page to display RIM event digest table.
*/
TPM_EVENTS("RIM Database", "ic_important_devices", "first"),
/**
RIM_DATABASE("RIM Database", "ic_important_devices", "first"),
\ /**
* Page that manages Attestation CA Policy.
*/
RIM_DATABASE("RIM Database", null, "first"),

9
HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java
View File

@ -286,15 +286,6 @@ public class ReferenceManifestPageController
}
}
}
for (EventLogMeasurements liveLog : EventLogMeasurements
.select(referenceManifestManager).getRIMs()) {
if (liveLog.getPlatformManufacturer().equals(base.getPlatformManufacturer())
&& liveLog.getPlatformModel().equals(base.getPlatformModel())) {
rim.setEventLogHash(liveLog.getEventLogHash());
break;
}
}
}
}
}

2
HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/RimDatabasePageController.java
View File

@ -104,9 +104,11 @@ public class RimDatabasePageController
*/
@Autowired
public RimDatabasePageController(
final DBReferenceManifestManager referenceManifestManager,
final DBReferenceDigestManager referenceDigestManager,
final DBReferenceEventManager referenceEventManager) {
super(Page.RIM_DATABASE);
this.referenceManifestManager = referenceManifestManager;
this.referenceDigestManager = referenceDigestManager;
this.referenceEventManager = referenceEventManager;
this.biosValidator = new BiosDateValidator(BIOS_RELEASE_DATE_FORMAT);

4
HIRS_Utils/src/main/java/hirs/persist/AbstractDbManager.java
View File

@ -818,9 +818,7 @@ public abstract class AbstractDbManager<T> implements CrudManager<T> {
LOGGER.info("Get unique result from criteria object");
recordsFiltered = (Long) criteria.uniqueResult();
} catch (HibernateException e) {
LOGGER.info(e.getMessage());
} catch (Exception e) {
LOGGER.info("Error while getting unique result: " + e.getMessage());
LOGGER.error(e.getMessage());
}
}