Add H5 measured boot to test application

Author: dgarske

include/tpm.h

@@ -62,6 +62,7 @@ const char* CSME_NSE_API wolfBoot_tpm2_get_alg_name(TPM_ALG_ID alg,
 const char* CSME_NSE_API wolfBoot_tpm2_get_rc_string(int rc,
     char* error, int error_sz);
 TPM_RC CSME_NSE_API wolfBoot_tpm2_get_capability(GetCapability_In* in, GetCapability_Out* out);
+int CSME_NSE_API wolfBoot_tpm2_read_pcr(uint8_t pcrIndex, uint8_t* digest, int* digestSz);
 
 #if defined(WOLFBOOT_TPM_VERIFY) || defined(WOLFBOOT_TPM_SEAL)
 int wolfBoot_load_pubkey(const uint8_t* pubkey_hint, WOLFTPM2_KEY* pubKey,

include/user_settings.h

@@ -410,6 +410,7 @@ extern int tolower(int c);
     #ifndef XTPM_WAIT
         #define XTPM_WAIT() /* no delay */
     #endif
+    #define HASH_COUNT 3 /* enable more PCR hash types */
 
     /* TPM remap printf */
     #if defined(DEBUG_WOLFTPM) && !defined(ARCH_SIM)

src/tpm.c

@@ -1187,6 +1187,14 @@ TPM_RC CSME_NSE_API wolfBoot_tpm2_get_capability(GetCapability_In* in, GetCapabi
     return TPM2_GetCapability(in, out);
 }
 
+int CSME_NSE_API wolfBoot_tpm2_read_pcr(uint8_t pcrIndex, uint8_t* digest, int* digestSz)
+{
+    return wolfTPM2_ReadPCR(&wolftpm_dev, pcrIndex, WOLFBOOT_TPM_PCR_ALG,
+        digest, digestSz);
+}
+
+
+
 
 
 /**

test-app/app_stm32h5.c

@@ -677,7 +677,7 @@ static int TPM2_PCRs_Print(void)
     GetCapability_In  capIn;
     GetCapability_Out capOut;
     TPML_PCR_SELECTION* pcrSel;
-    char buffer[24];
+    char algName[24];
 
     /* List available PCR's */
     XMEMSET(&capIn, 0, sizeof(capIn));
@@ -691,7 +691,7 @@ static int TPM2_PCRs_Print(void)
         for (pcrCount=0; pcrCount < (int)pcrSel->count; pcrCount++) {
 
             printf("\t%s: ", wolfBoot_tpm2_get_alg_name(
-                pcrSel->pcrSelections[pcrCount].hash, buffer, sizeof(buffer)));
+                pcrSel->pcrSelections[pcrCount].hash, algName, sizeof(algName)));
             for (pcrIndex=0;
                 pcrIndex<pcrSel->pcrSelections[pcrCount].sizeofSelect*8;
                 pcrIndex++) {
@@ -711,7 +711,10 @@ static int cmd_tpm_info(const char *args)
     int rc;
     WOLFTPM2_CAPS caps;
     TPML_HANDLE handles;
-    char error[100];
+#ifdef WOLFBOOT_MEASURED_PCR_A
+    byte hashBuf[TPM_MAX_DIGEST_SIZE];
+    int hashSz;
+#endif
 
     printf("Get TPM 2.0 module information\r\n");
 
@@ -731,11 +734,36 @@ static int cmd_tpm_info(const char *args)
         for (i=0; i<(int)handles.count; i++) {
             printf("\tHandle 0x%x\r\n", (unsigned int)handles.handle[i]);
         }
+        rc = 0;
     }
 
     /* Print the available PCR's */
-    rc = TPM2_PCRs_Print();
+    if (rc == 0) {
+        rc = TPM2_PCRs_Print();
+    }
+
+#ifdef WOLFBOOT_MEASURED_PCR_A
+    /* Read measured boot PCR */
+    if (rc == 0) {
+        char algName[24];
+        printf("Measured boot: PCR %s %d\r\n",
+            wolfBoot_tpm2_get_alg_name(WOLFBOOT_TPM_PCR_ALG, algName, sizeof(algName)),
+            WOLFBOOT_MEASURED_PCR_A);
+        hashSz = 0;
+        rc = wolfBoot_tpm2_read_pcr(WOLFBOOT_MEASURED_PCR_A, hashBuf, &hashSz);
+        if (rc == 0) {
+            int i;
+            printf("PCR (%d bytes): ", hashSz);
+            for (i = 0; i < hashSz; i++) {
+                printf("%02x", hashBuf[i]);
+            }
+            printf("\r\n");
+        }
+    }
+#endif
+
     if (rc != 0) {
+        char error[100];
         printf("TPM error 0x%x: %s\r\n",
             rc, wolfBoot_tpm2_get_rc_string(rc, error, sizeof(error)));
     }