ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2024-12-24 07:06:46 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

minor clean up

Browse Source
This commit is contained in:
lareine 2022-02-23 09:15:08 -05:00
parent 58c3e655fe
commit 8975282cf7
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,14 +109,13 @@ function initTpm2Emulator {
sed -i "s/WARN/INFO/" /etc/hirs/TPM2_Provisioner/log4cplus_config.ini sed -i "s/WARN/INFO/" /etc/hirs/TPM2_Provisioner/log4cplus_config.ini
} }
# Clear our existing PCR values by restarting the ibm tpm simulator # Clear out existing TPM PCR values by restarting the ibm tpm simulator
function resetTpm2Emulator { function resetTpm2Emulator {
echo "clearing the TPM PCR values" echo "clearing the TPM PCR values"
# rm -f /ibmtpm/src/NVChip # NVChip can persist some TPM data between starts
# Stop tpm2-abrmd and the tpm server # Stop tpm2-abrmd and the tpm server
pkill -f "tpm2-abrmd" pkill -f "tpm2-abrmd"
pkill -f "tpm_server" pkill -f "tpm_server"
# rstart the tpm server and tpm2-abrmd # restart the tpm server and tpm2-abrmd
/ibmtpm/src/./tpm_server & /ibmtpm/src/./tpm_server &
pushd /ibmtss/utils > /dev/null pushd /ibmtss/utils > /dev/null
./startup ./startup
@ -155,8 +154,8 @@ DEFAULT_SITE_CONFIG_FILE
cat /etc/hirs/hirs-site.config cat /etc/hirs/hirs-site.config
} }
function waitForAca {
# Wait for ACA to boot # Wait for ACA to boot
function waitForAca {
echo "Waiting for ACA to spin up at address ${HIRS_ACA_PORTAL_IP} on port ${HIRS_ACA_PORTAL_PORT} ..." echo "Waiting for ACA to spin up at address ${HIRS_ACA_PORTAL_IP} on port ${HIRS_ACA_PORTAL_PORT} ..."
until [ "`curl --silent --connect-timeout 1 -I -k https://${HIRS_ACA_PORTAL_IP}:${HIRS_ACA_PORTAL_PORT}/HIRS_AttestationCAPortal | grep '302 Found'`" != "" ]; do until [ "`curl --silent --connect-timeout 1 -I -k https://${HIRS_ACA_PORTAL_IP}:${HIRS_ACA_PORTAL_PORT}/HIRS_AttestationCAPortal | grep '302 Found'`" != "" ]; do
sleep 1; sleep 1;

1
.ci/system-tests/container/pc_setup.sh
View File

@ -14,7 +14,6 @@ testDir="/HIRS/.ci/system-tests/profiles/$profile/$test"
pcDir=$testDir/platformcerts pcDir=$testDir/platformcerts
profileDir="/HIRS/.ci/system-tests/profiles/$profile" profileDir="/HIRS/.ci/system-tests/profiles/$profile"
# Current TCG folder for platform certs, likely to change with release of the next FIM specification # Current TCG folder for platform certs, likely to change with release of the next FIM specification
tcgDir=/boot/tcg/cert/platform/ tcgDir=/boot/tcg/cert/platform/
mkdir -p $tcgDir; # Create the platform cert folder if its not there mkdir -p $tcgDir; # Create the platform cert folder if its not there