test rc get random

JuergenReppSIT · Jan 17, 2025 · efd66d3 · efd66d3
1 parent 33384e5
commit efd66d3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.ci/docker.run b/.ci/docker.run
@@ -94,7 +94,7 @@ fi
 if [ "$SCANBUILD" == "yes" ]; then
   scan-build --status-bugs make -j
 elif [ "$CC" == "clang" ]; then
-  make -j distcheck
+  make -j distcheck V=1
 else
   make -j check
 fi

diff --git a/src/tss2-esys/api/Esys_GetRandom.c b/src/tss2-esys/api/Esys_GetRandom.c
@@ -7,7 +7,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h" // IWYU pragma: keep
 #endif
-
+#include <stdio.h>
 #include <inttypes.h>         // for PRIx32, PRIx16, int32_t
 #include <stdlib.h>           // for NULL, calloc
 
@@ -254,6 +254,8 @@ Esys_GetRandom_Finish(
     }
     /* This block handle the resubmission of TPM commands given a certain set of
      * TPM response codes. */
+    fprintf(stdout, "XXX Test return code %x", r);
+    LOG_ERROR("XXX Test return code %x", r);
     if (r == TPM2_RC_RETRY || r == TPM2_RC_TESTING || r == TPM2_RC_YIELDED) {
         LOG_DEBUG("TPM returned RETRY, TESTING or YIELDED, which triggers a "
             "resubmission: %" PRIx32, r);

diff --git a/test/integration/esys-cp-hash.int.c b/test/integration/esys-cp-hash.int.c
@@ -98,7 +98,9 @@ test_esyscp_hash(ESYS_CONTEXT * esys_context)
     free(cp_hash);
 
     r = Esys_GetRandom_Finish(esys_context, &randomBytes);
-    while (r == TSS2_ESYS_RC_TRY_AGAIN) {
+    LOG_ERROR("XXX Test return code2 %x", r);
+    while (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) {
+    // while (r == TSS2_ESYS_RC_TRY_AGAIN) {
        r = Esys_GetRandom_Finish(esys_context, &randomBytes);
     }
     if (r != TPM2_RC_SUCCESS) {
@@ -155,7 +157,8 @@ test_esyscp_hash(ESYS_CONTEXT * esys_context)
         LOG_ERROR("FlushContext FAILED! Response Code : 0x%x", r);
     }
 
-    return EXIT_SUCCESS;
+    // return EXIT_SUCCESS;
+    return 77;
 
   error_cleansession:
     r = Esys_FlushContext(esys_context, session);