Add tests for the TLS PK with TPM.

wolfSSL · Dec 8, 2023 · a50e4fe · a50e4fe
1 parent c0cd64d
commit a50e4fe
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/.github/workflows/make-test-swtpm.yml b/.github/workflows/make-test-swtpm.yml
@@ -25,7 +25,7 @@ jobs:
       run: ./autogen.sh
     - name: wolfssl configure
       working-directory: ./wolfssl
-      run: ./configure --enable-wolftpm
+      run: ./configure --enable-wolftpm --enable-pkcallbacks
     - name: wolfssl make install
       working-directory: ./wolfssl
       run: sudo make install

diff --git a/examples/run_examples.sh b/examples/run_examples.sh
@@ -218,6 +218,7 @@ run_tpm_tls_server() { # Usage: run_tpm_tls_server [ecc/rsa] [tpmargs]]
 }
 
 if [ $WOLFCRYPT_ENABLE -eq 1 ]; then
+    # Run with Crypto CB
     run_tpm_tls_client "rsa" ""
     run_tpm_tls_client "rsa" "-aes"
     run_tpm_tls_client "ecc" ""
@@ -227,6 +228,17 @@ if [ $WOLFCRYPT_ENABLE -eq 1 ]; then
     run_tpm_tls_server "rsa" "-aes"
     run_tpm_tls_server "ecc" ""
     run_tpm_tls_server "ecc" "-aes"
+
+    # Run with PK
+    run_tpm_tls_client "rsa" "-pk"
+    run_tpm_tls_client "rsa" "-pk -aes"
+    run_tpm_tls_client "ecc" "-pk"
+    run_tpm_tls_client "ecc" "-pk -aes"
+
+    run_tpm_tls_server "rsa" "-pk "
+    run_tpm_tls_server "rsa" "-pk -aes"
+    run_tpm_tls_server "ecc" "-pk"
+    run_tpm_tls_server "ecc" "-pk -aes"
 fi
 
 

diff --git a/examples/tls/tls_client.c b/examples/tls/tls_client.c
@@ -193,6 +193,7 @@ int TPM2_TLS_ClientArgs(void* userCtx, int argc, char *argv[])
     printf("\tUse %s keys\n", useECC ? "ECC" : "RSA");
     printf("\tUse Parameter Encryption: %s\n", TPM2_GetAlgName(paramEncAlg));
     printf("\tUsing Port: %d\n", port);
+    printf("\tUsing %s callbacks\n", usePK ? "PK" : "Crypto");
 
     /* Init the TPM2 device */
     rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);

diff --git a/examples/tls/tls_server.c b/examples/tls/tls_server.c
@@ -210,6 +210,7 @@ int TPM2_TLS_ServerArgs(void* userCtx, int argc, char *argv[])
     printf("\tUse %s keys\n", useECC ? "ECC" : "RSA");
     printf("\tUse Parameter Encryption: %s\n", TPM2_GetAlgName(paramEncAlg));
     printf("\tUsing Port: %d\n", port);
+    printf("\tUsing %s callbacks\n", usePK ? "PK" : "Crypto");
 
     /* Init the TPM2 device */
     rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);