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

Merge pull request #403 from nsacyber/rim-lookup-fix

Browse Source 
Supplemental RIM Hash Fix
This commit is contained in:
iadgovuser26 2021-10-20 18:15:43 -04:00 committed by GitHub
commit 124752c72d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,7 +92,6 @@ public abstract class PageController<P extends PageParams> {
* @return A generic ModelAndView containing basic information for the page.
*/
protected final ModelAndView getBaseModelAndView(final Page newPage) {
ModelMap modelMap = new ExtendedModelMap();
// add page information
@ -110,7 +109,6 @@ public abstract class PageController<P extends PageParams> {
}
return new ModelAndView(newPage.getViewName(), modelMap);
}
/**
@ -170,7 +168,5 @@ public abstract class PageController<P extends PageParams> {
}
return redirect;
}
}

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

@ -385,7 +385,7 @@ public class ReferenceManifestDetailsPageController
// starts off checking if associated rim is null; that is irrelevant for
// this statement.
measurements = EventLogMeasurements.select(referenceManifestManager)
.byHexDecHash(support.getEventLogHash()).getRIM();
.byHexDecHash(support.getHexDecHash()).getRIM();
if (support.isSwidPatch()) {
data.put("swidPatch", "True");

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

@ -160,7 +160,6 @@ public class ReferenceManifestPageController
@Override
public void modify(final Criteria criteria) {
criteria.add(Restrictions.isNull(Certificate.ARCHIVE_FIELD));
}
};
FilteredRecordsList<ReferenceManifest> records