FAPI: Fix and improve state error reporting.

Signed-off-by: Andreas Fuchs <andreas.fuchs@infineon.com>

Author: AndreasFuchsTPM

src/tss2-fapi/api/Fapi_GetInfo.c

@@ -226,6 +226,8 @@ Fapi_GetInfo_Finish(
     IFAPI_INFO *infoObj = &command->info_obj;
     TPMS_CAPABILITY_DATA *capabilityData = NULL;
 
+    LOG_TRACE("Current state is: %i", context->state);
+
     switch (context->state) {
     case GET_INFO_GET_CAP:
         /* Initialize the property for the first ESAPI call */

src/tss2-fapi/fapi_util.c

@@ -4263,6 +4263,8 @@ ifapi_capability_get(FAPI_CONTEXT *context, TPM2_CAP capability,
     TSS2_RC r = TSS2_RC_SUCCESS;
     ESYS_CONTEXT *ectx = context->esys;
 
+    LOG_TRACE("Current state is: %i", context->state);
+
     switch (context->state) {
     statecase(context->state, GET_INFO_GET_CAP);
         /* fetch capability info */

src/tss2-fapi/ifapi_macros.h

@@ -134,12 +134,12 @@
 
 #define statecasedefault(VAR) \
     default: \
-        LOG_ERROR("Bad state for " str(VAR)); \
+        LOG_ERROR("Bad state for " str(VAR) ": %i", VAR); \
         return TSS2_FAPI_RC_BAD_SEQUENCE;
 
 #define statecasedefault_error(VAR, r, label)         \
     default: \
-        LOG_ERROR("Bad state for " str(VAR)); \
+        LOG_ERROR("Bad state for " str(VAR) ": %i", VAR); \
         (r) = TSS2_FAPI_RC_BAD_SEQUENCE; \
         goto label;
 

src/tss2-fapi/ifapi_policy_callbacks.c

@@ -1465,7 +1465,7 @@ ifapi_exec_auth_policy(
             cb_ctx->cb_state = POL_CB_EXECUTE_INIT;
             break;
 
-        statecasedefault_error(cb_ctx->state, r, cleanup);
+        statecasedefault_error(cb_ctx->cb_state, r, cleanup);
     }
 cleanup:
     SAFE_FREE(names);
@@ -1637,7 +1637,7 @@ ifapi_exec_auth_nv_policy(
             cb_ctx->cb_state = POL_CB_EXECUTE_INIT;
             break;
 
-        statecasedefault_error(cb_ctx->state, r, cleanup);
+        statecasedefault_error(cb_ctx->cb_state, r, cleanup);
     }
 cleanup:
     cleanup_policy_list(current_policy->policy_list);