ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-01-30 08:04:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #408 from nsacyber/support-rim-filename-correction

Browse Source 
Support RIM Filename Fix
This commit is contained in:
chubtub 2021-11-05 08:57:06 -04:00 committed by GitHub
commit 7bb9d8698d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 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/controllers/ReferenceManifestDetailsPageController.java
View File

@ -285,8 +285,8 @@ public class ReferenceManifestDetailsPageController
// going to have to pull the filename and grab that from the DB // going to have to pull the filename and grab that from the DB
// to get the id to make the link // to get the id to make the link
for (SwidResource swidRes : resources) { for (SwidResource swidRes : resources) {
if (support != null && swidRes.getName() if (support != null && swidRes.getHashValue()
.equals(support.getFileName())) { .equalsIgnoreCase(support.getHexDecHash())) {
RIM_VALIDATOR.validateSupportRimHash(support.getRimBytes(), RIM_VALIDATOR.validateSupportRimHash(support.getRimBytes(),
swidRes.getHashValue()); swidRes.getHashValue());
if (RIM_VALIDATOR.isSupportRimValid()) { if (RIM_VALIDATOR.isSupportRimValid()) {

2
HIRS_Utils/src/main/java/hirs/utils/JsonUtils.java
View File

@ -84,7 +84,7 @@ public final class JsonUtils {
JsonObject jsonObject = new JsonObject(); JsonObject jsonObject = new JsonObject();
if (Files.notExists(jsonPath)) { if (Files.notExists(jsonPath)) {
LOGGER.error(String.format("No file found at %s.", jsonPath.toString())); LOGGER.warn(String.format("No file found at %s.", jsonPath.toString()));
} else { } else {
try { try {
InputStream inputStream = new FileInputStream(jsonPath.toString()); InputStream inputStream = new FileInputStream(jsonPath.toString());