test: gracefully handle TPM2_RC_COMMAND_CODE in various tests

Signed-off-by: Johannes Holland <johannes.holland@infineon.de>
tpm2-software · Jul 16, 2024 · 29291bc · 29291bc
1 parent 89be4c7
commit 29291bc
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 3 deletions.
diff --git a/test/integration/esys-audit.int.c b/test/integration/esys-audit.int.c
@@ -236,10 +236,12 @@ test_esys_audit(ESYS_CONTEXT * esys_context)
         LOG_WARNING("Platform authorization not possible.");
         failure_return =  EXIT_SKIP;
         goto error;
+    } else if (r == TPM2_RC_COMMAND_CODE) {
+        /* Ignore command not supported */
+    } else {
+        goto_if_error(r, "Error: SetCommandCodeAuditStatus", error);
     }
 
-    goto_if_error(r, "Error: SetCommandCodeAuditStatus", error);
-
     r = Esys_FlushContext(esys_context, signHandle);
     goto_if_error(r, "Error: FlushContext", error);
 

diff --git a/test/integration/sys-create-loaded.int.c b/test/integration/sys-create-loaded.int.c
@@ -12,6 +12,7 @@
 #include <stdlib.h>           // for exit, NULL, size_t
 #include <string.h>           // for memset, memcpy
 
+#include "test-esys.h"        // for EXIT_SKIP
 #include "tss2_common.h"      // for TSS2_RC, TSS2_RC_SUCCESS, TSS2_BASE_RC_...
 #include "tss2_mu.h"          // for Tss2_MU_TPMT_PUBLIC_Marshal
 #include "tss2_sys.h"         // for Tss2_Sys_CreateLoaded, Tss2_Sys_FlushCo...
@@ -86,6 +87,8 @@ test_invoke (TSS2_SYS_CONTEXT *sys_context)
                                 &auth_rsp);
     if (rc == TPM2_RC_SUCCESS) {
         LOG_INFO("success object handle: 0x%x", object_handle);
+    } else if (rc == TPM2_RC_COMMAND_CODE) {
+        return EXIT_SKIP;
     } else {
         LOG_ERROR("CreateLoaded FAILED! Response Code : 0x%x", rc);
         exit(1);

diff --git a/test/integration/sys-policy-authorizeNV.int.c b/test/integration/sys-policy-authorizeNV.int.c
@@ -201,7 +201,37 @@ test_invoke (TSS2_SYS_CONTEXT *sys_context)
                                 &out_public,
                                 &name,
                                 &rsp_auth);
-    if (rc != TPM2_RC_SUCCESS) {
+    if (rc == TPM2_RC_COMMAND_CODE) {
+        TPM2B_PUBLIC in_public_with_size = {
+            .size = sizeof(TPMT_PUBLIC),
+            .publicArea = { 0 },
+        };
+        memcpy(&in_public_with_size.publicArea, &in_public, sizeof(TPMT_PUBLIC));
+
+        TPM2B_DATA outside_info = {0};
+        TPM2B_CREATION_DATA creation_data = {0};
+        TPML_PCR_SELECTION creation_pcr = {0};
+        TPM2B_DIGEST creation_hash = {0};
+        TPMT_TK_CREATION creation_ticket = {0};
+        rc = Tss2_Sys_CreatePrimary (sys_context,
+                                     TPM2_RH_OWNER,
+                                     &cmd_auth,
+                                     &in_sensitive,
+                                     &in_public_with_size,
+                                     &outside_info,
+                                     &creation_pcr,
+                                     &object_handle,
+                                     &out_public,
+                                     &creation_data,
+                                     &creation_hash,
+                                     &creation_ticket,
+                                     &name,
+                                     &rsp_auth);
+        if (rc != TPM2_RC_SUCCESS) {
+            LOG_ERROR("CreatePrimary FAILED! Response Code: 0x%x", rc);
+            exit(1);
+        }
+    } else if (rc != TPM2_RC_SUCCESS) {
         LOG_ERROR("CreateLoaded FAILED! Response Code: 0x%x", rc);
         exit(1);
     }