From 7037bc1fc1bd35c2f75a66a282ba3dbbec851434 Mon Sep 17 00:00:00 2001 From: lareine Date: Tue, 22 Feb 2022 08:52:56 -0500 Subject: [PATCH] increased ibmtpm timeouts increased ibmtpm timeouts increased ibmtpm timeouts increased ibmtpm timeouts increased ibmtpm timeouts tpm shutdown added tpm shutdown added timeouts removed timeout incremented timeout incremented --- .ci/setup/container/tpm2_common.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.ci/setup/container/tpm2_common.sh b/.ci/setup/container/tpm2_common.sh index 7de1d222..13ef4b6d 100755 --- a/.ci/setup/container/tpm2_common.sh +++ b/.ci/setup/container/tpm2_common.sh @@ -114,16 +114,23 @@ function resetTpm2Emulator { echo "clearing the TPM PCR values" + rm -f /ibmtpm/src/NVChip + pushd /ibmtss/utils > /dev/null + ./shutdown + popd > /dev/null + pkill -f "tpm2-abrmd" pkill -f "tpm_server" - rm -f /ibmtpm/src/NVChip /ibmtpm/src/./tpm_server & - sleep 1 +# sleep 1 pushd /ibmtss/utils > /dev/null ./startup - sleep 1 +# sleep 3 popd > /dev/null + tpm2-abrmd -t socket & +# sleep 1 + tpm2_pcrlist -g sha256 } # Function to update the hirs-site.config file