ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-02-12 05:55:22 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Attempt to solve uploaded rim linkup

Browse Source
This commit is contained in:
iadgovuser29 2024-07-12 17:13:34 -04:00
parent f9a2bf7ff9
commit 1d1302951a
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/setup/container/tpm2_common.sh
View File

@ -292,7 +292,7 @@ function startFreshTpmServer {
else else
echo -n "Starting TPM server..." echo -n "Starting TPM server..."
/ibmswtpm2/src/tpm_server -rm &> /dev/null & /ibmswtpm2/src/tpm_server -rm &> /dev/null &
sleep 5 sleep 2
pid=$(findTpmServerPid) pid=$(findTpmServerPid)
echo "...running with pid: $pid" echo "...running with pid: $pid"
fi fi
@ -301,7 +301,7 @@ function startFreshTpmServer {
function startupTpm { function startupTpm {
echo "Running tpm2_startup" echo "Running tpm2_startup"
tpm2_startup -T mssim -c tpm2_startup -T mssim -c
sleep 5 sleep 2
} }
function installEkCert { function installEkCert {

11
HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/provision/IdentityClaimProcessor.java
View File

@ -490,18 +490,23 @@ public class IdentityClaimProcessor extends AbstractProcessor {
.getBaseByManufacturerModel(dv.getHw().getManufacturer(), .getBaseByManufacturerModel(dv.getHw().getManufacturer(),
dv.getHw().getProductName()); dv.getHw().getProductName());
measurements = temp; measurements = temp;
if (tagId != null && !tagId.isEmpty()) {
measurements.setTagId(tagId);
}
measurements.setPlatformManufacturer(dv.getHw().getManufacturer()); measurements.setPlatformManufacturer(dv.getHw().getManufacturer());
measurements.setPlatformModel(dv.getHw().getProductName()); measurements.setPlatformModel(dv.getHw().getProductName());
measurements.setTagId(tagId); measurements.setTagId(tagId);
measurements.setDeviceName(dv.getNw().getHostname()); measurements.setDeviceName(dv.getNw().getHostname());
measurements.archive(); measurements.archive();
this.referenceManifestRepository.save(measurements);
for (BaseReferenceManifest baseRim : baseRims) { for (BaseReferenceManifest baseRim : baseRims) {
if (baseRim != null) { if (baseRim != null) {
// pull the base versions of the swidtag and rimel and set the // pull the base versions of the swidtag and rimel and set the
// event log hash for use during provision // event log hash for use during provision
if ((tagId == null || tagId.trim().isEmpty()) && !baseRim.getTagId().isEmpty()) {
tagId = baseRim.getTagId();
measurements.setTagId(tagId);
}
SupportReferenceManifest sBaseRim = referenceManifestRepository SupportReferenceManifest sBaseRim = referenceManifestRepository
.getSupportRimEntityById(baseRim.getAssociatedRim()); .getSupportRimEntityById(baseRim.getAssociatedRim());
baseRim.setEventLogHash(temp.getHexDecHash()); baseRim.setEventLogHash(temp.getHexDecHash());
@ -510,6 +515,8 @@ public class IdentityClaimProcessor extends AbstractProcessor {
referenceManifestRepository.save(sBaseRim); referenceManifestRepository.save(sBaseRim);
} }
} }
this.referenceManifestRepository.save(measurements);
} catch (IOException ioEx) { } catch (IOException ioEx) {
log.error(ioEx); log.error(ioEx);
} }