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

added wait to tpr2Reset

Browse Source 
rewrote tcg_boot.properties

rewrote tcg_boot.properties
This commit is contained in:
lareine 2022-02-17 16:05:19 -05:00
parent 7013552e78
commit 48205a27f1
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,8 +8,6 @@ pushd / > /dev/null
echo "Setting up TPM emulator for the TPM2 Provisioner" echo "Setting up TPM emulator for the TPM2 Provisioner"
source /HIRS/.ci/setup/container/tpm2_common.sh source /HIRS/.ci/setup/container/tpm2_common.sh
mkdir -p /etc/hirs
touch /etc/hirs/tcg_boot.properties # work around for install issues with tcg default values
#Wait for the ACA to spin up, if it hasnt already #Wait for the ACA to spin up, if it hasnt already
waitForAca waitForAca
@ -18,7 +16,7 @@ waitForAca
installProvisioner installProvisioner
# set location of tcg artifacts # set location of tcg artifacts
#setTcgProperties setTcgProperties
#echo "Contents of /etc/hirs is $(ls -al /etc/hirs)"; #echo "Contents of /etc/hirs is $(ls -al /etc/hirs)";
# Install TPM 2.0 Emulator # Install TPM 2.0 Emulator

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

@ -28,9 +28,6 @@ function setTpmPcrValues {
cd ../utils cd ../utils
./startup ./startup
echo "Looking for ibms nvchip file"
find /ibmtss -name nvchip
find /ibmtpm -name nvchip
popd > /dev/null popd > /dev/null
} }
@ -121,9 +118,10 @@ echo "clearing the TPM PCR values"
pkill -f "tpm2-abrmd" pkill -f "tpm2-abrmd"
pkill -f "tpm_server" pkill -f "tpm_server"
/ibmtpm/src/./tpm_server & /ibmtpm/src/./tpm_server &
sleep 1
pushd /ibmtss/utils > /dev/null pushd /ibmtss/utils > /dev/null
./startup ./startup
sleep 1
popd > /dev/null popd > /dev/null
tpm2-abrmd -t socket & tpm2-abrmd -t socket &
} }