FAPI TEST: Create EK certificate before calling FAPI test.

JuergenReppSIT · Nov 28, 2023 · a5db85d · a5db85d
1 parent 9cf5623
commit a5db85d
Show file tree

Hide file tree

Showing 4 changed files with 234 additions and 82 deletions.
diff --git a/script/fint-log-compiler.sh b/script/fint-log-compiler.sh
@@ -42,25 +42,6 @@ echo "TPM20TEST_TCTI=${TPM20TEST_TCTI}"
 
 while true; do
 
-if [[ ${TPM20TEST_TCTI} != *device* ]]; then
-    env TPM20TEST_TCTI="${TPM20TEST_TCTI}" \
-        TCTI_PCAP_FILE="${TCTI_PCAP_FILE}" \
-        G_MESSAGES_DEBUG=all ./test/helper/tpm_startup
-    if [ $? -ne 0 ]; then
-        echo "TPM_StartUp failed"
-        ret=99
-        break
-    fi
-else
-    env TPM20TEST_TCTI=${TPM20TEST_TCTI} \
-        TCTI_PCAP_FILE="${TCTI_PCAP_FILE}" \
-        G_MESSAGES_DEBUG=all ./test/helper/tpm_transientempty
-    if [ $? -ne 0 ]; then
-        echo "TPM transient area not empty => skipping"
-        ret=99
-        break
-    fi
-fi
 INTERMEDCA_FILE=ca/intermed-ca/intermed-ca.cert
 ROOTCA_FILE=ca/root-ca/root-ca.cert
 
@@ -72,6 +53,12 @@ if [[ ${TPM20TEST_TCTI} == *device* ]]; then
         G_MESSAGES_DEBUG=all ${@: -1}
 else
     # Run test with generated certificate.
+
+    EKECCCERT_PEM_FILE=${TEST_BIN}_ekecccert.pem
+    export FAPI_TEST_CERTIFICATE_ECC="${EKECCCERT_PEM_FILE}"
+    EKCERT_PEM_FILE=${TEST_BIN}_ekcert.pem
+    export FAPI_TEST_CERTIFICATE="${EKCERT_PEM_FILE}"
+
     env TPM20TEST_TCTI="${TPM20TEST_TCTI}" \
         TCTI_PCAP_FILE="${TCTI_PCAP_FILE}" \
         FAPI_TEST_ROOT_CERT=${ROOTCA_FILE}.pem \