diff --git a/.clang-tidy b/.clang-tidy new file mode 100644 index 000000000..8353f1c36 --- /dev/null +++ b/.clang-tidy @@ -0,0 +1,38 @@ +# -bugprone-assignment-in-if-condition +# [TODO] opinionated, we might want to enable that at some point +# -bugprone-branch-clone +# In some cases it is more readable to have identical branch blocks +# -bugprone-easily-swappable-parameters: +# We have a lot integer-liky types (e.g. TPMI_RH_NV_INDEX) which we do not +# want to turn into opaque or strong types. They are part of the API. +# -bugprone-implicit-widening-of-multiplication-result +# [TODO] +# -bugprone-reserved-identifier +# [TODO] +# +# -clang-analyzer-optin.performance.Padding +# We prefer logical/semantic order over (potentially insignificant) +# optimization. +# -clang-analyzer-security.insecureAPI +# There is no real alternative to strcat etc. in C99. +# -clang-analyzer-valist.Uninitialized +# Bugged: https://bugs.llvm.org/show_bug.cgi?id=41311 + +--- +Checks: "\ + bugprone*, \ + -bugprone-assignment-in-if-condition, \ + -bugprone-branch-clone, \ + -bugprone-easily-swappable-parameters, \ + -bugprone-implicit-widening-of-multiplication-result, \ + -bugprone-reserved-identifier, \ + \ + clang-analyzer, \ + -clang-analyzer-optin.performance.Padding, \ + -clang-analyzer-security.insecureAPI.*, \ + -clang-analyzer-valist.Uninitialized, \ + \ + clang-diagnostic*, \ +" +WarningsAsErrors: "*" +HeaderFilterRegex: "(src|include)/.*" diff --git a/include/tss2/tss2_common.h b/include/tss2/tss2_common.h index 2d953d79e..73ae1e241 100644 --- a/include/tss2/tss2_common.h +++ b/include/tss2/tss2_common.h @@ -50,7 +50,7 @@ typedef uint32_t TSS2_RC; * layer that generated the error. */ #define TSS2_RC_LAYER_SHIFT (16) -#define TSS2_RC_LAYER(level) ((TSS2_RC)level << TSS2_RC_LAYER_SHIFT) +#define TSS2_RC_LAYER(level) ((TSS2_RC)(level) << TSS2_RC_LAYER_SHIFT) #define TSS2_RC_LAYER_MASK TSS2_RC_LAYER(0xff) /* These layer codes are reserved for software layers defined in the TCG diff --git a/include/tss2/tss2_esys.h b/include/tss2/tss2_esys.h index ff7384225..eab4e4c25 100644 --- a/include/tss2/tss2_esys.h +++ b/include/tss2/tss2_esys.h @@ -3796,7 +3796,7 @@ Esys_Vendor_TCG_Test_Finish( */ void Esys_Free( - void *__ptr); + void *ptr); TSS2_RC Esys_GetSysContext( diff --git a/include/tss2/tss2_tcti.h b/include/tss2/tss2_tcti.h index a0fd2cf77..05f32426d 100644 --- a/include/tss2/tss2_tcti.h +++ b/include/tss2/tss2_tcti.h @@ -63,39 +63,39 @@ typedef void TSS2_TCTI_POLL_HANDLE; #endif /* The following are used to configure timeout characteristics. */ -#define TSS2_TCTI_TIMEOUT_BLOCK -1 +#define TSS2_TCTI_TIMEOUT_BLOCK (-1) #define TSS2_TCTI_TIMEOUT_NONE 0 /* Macros to simplify access to values in common TCTI structure */ #define TSS2_TCTI_MAGIC(tctiContext) \ - ((TSS2_TCTI_CONTEXT_COMMON_V1*)tctiContext)->magic + ((TSS2_TCTI_CONTEXT_COMMON_V1*)(tctiContext))->magic #define TSS2_TCTI_VERSION(tctiContext) \ - ((TSS2_TCTI_CONTEXT_COMMON_V1*)tctiContext)->version + ((TSS2_TCTI_CONTEXT_COMMON_V1*)(tctiContext))->version #define TSS2_TCTI_TRANSMIT(tctiContext) \ - ((TSS2_TCTI_CONTEXT_COMMON_V1*)tctiContext)->transmit + ((TSS2_TCTI_CONTEXT_COMMON_V1*)(tctiContext))->transmit #define TSS2_TCTI_RECEIVE(tctiContext) \ - ((TSS2_TCTI_CONTEXT_COMMON_V1*)tctiContext)->receive + ((TSS2_TCTI_CONTEXT_COMMON_V1*)(tctiContext))->receive #define TSS2_TCTI_FINALIZE(tctiContext) \ - ((TSS2_TCTI_CONTEXT_COMMON_V1*)tctiContext)->finalize + ((TSS2_TCTI_CONTEXT_COMMON_V1*)(tctiContext))->finalize #define TSS2_TCTI_CANCEL(tctiContext) \ - ((TSS2_TCTI_CONTEXT_COMMON_V1*)tctiContext)->cancel + ((TSS2_TCTI_CONTEXT_COMMON_V1*)(tctiContext))->cancel #define TSS2_TCTI_GET_POLL_HANDLES(tctiContext) \ - ((TSS2_TCTI_CONTEXT_COMMON_V1*)tctiContext)->getPollHandles + ((TSS2_TCTI_CONTEXT_COMMON_V1*)(tctiContext))->getPollHandles #define TSS2_TCTI_SET_LOCALITY(tctiContext) \ - ((TSS2_TCTI_CONTEXT_COMMON_V1*)tctiContext)->setLocality + ((TSS2_TCTI_CONTEXT_COMMON_V1*)(tctiContext))->setLocality #define TSS2_TCTI_MAKE_STICKY(tctiContext) \ - ((TSS2_TCTI_CONTEXT_COMMON_V2*)tctiContext)->makeSticky + ((TSS2_TCTI_CONTEXT_COMMON_V2*)(tctiContext))->makeSticky /* Macros to simplify invocation of functions from the common TCTI structure */ #define Tss2_Tcti_Transmit(tctiContext, size, command) \ - ((tctiContext == NULL) ? TSS2_TCTI_RC_BAD_REFERENCE: \ + (((tctiContext) == NULL) ? TSS2_TCTI_RC_BAD_REFERENCE: \ (TSS2_TCTI_VERSION(tctiContext) < 1) ? \ TSS2_TCTI_RC_ABI_MISMATCH: \ (TSS2_TCTI_TRANSMIT(tctiContext) == NULL) ? \ TSS2_TCTI_RC_NOT_IMPLEMENTED: \ TSS2_TCTI_TRANSMIT(tctiContext)(tctiContext, size, command)) #define Tss2_Tcti_Receive(tctiContext, size, response, timeout) \ - ((tctiContext == NULL) ? TSS2_TCTI_RC_BAD_REFERENCE: \ + (((tctiContext) == NULL) ? TSS2_TCTI_RC_BAD_REFERENCE: \ (TSS2_TCTI_VERSION(tctiContext) < 1) ? \ TSS2_TCTI_RC_ABI_MISMATCH: \ (TSS2_TCTI_RECEIVE(tctiContext) == NULL) ? \ @@ -103,7 +103,7 @@ typedef void TSS2_TCTI_POLL_HANDLE; TSS2_TCTI_RECEIVE(tctiContext)(tctiContext, size, response, timeout)) #define Tss2_Tcti_Finalize(tctiContext) \ do { \ - if ((tctiContext != NULL) && \ + if (((tctiContext) != NULL) && \ (TSS2_TCTI_VERSION(tctiContext) >= 1) && \ (TSS2_TCTI_FINALIZE(tctiContext) != NULL)) \ { \ @@ -111,28 +111,28 @@ typedef void TSS2_TCTI_POLL_HANDLE; } \ } while (0) #define Tss2_Tcti_Cancel(tctiContext) \ - ((tctiContext == NULL) ? TSS2_TCTI_RC_BAD_REFERENCE: \ + (((tctiContext) == NULL) ? TSS2_TCTI_RC_BAD_REFERENCE: \ (TSS2_TCTI_VERSION(tctiContext) < 1) ? \ TSS2_TCTI_RC_ABI_MISMATCH: \ (TSS2_TCTI_CANCEL(tctiContext) == NULL) ? \ TSS2_TCTI_RC_NOT_IMPLEMENTED: \ TSS2_TCTI_CANCEL(tctiContext)(tctiContext)) #define Tss2_Tcti_GetPollHandles(tctiContext, handles, num_handles) \ - ((tctiContext == NULL) ? TSS2_TCTI_RC_BAD_REFERENCE: \ + (((tctiContext) == NULL) ? TSS2_TCTI_RC_BAD_REFERENCE: \ (TSS2_TCTI_VERSION(tctiContext) < 1) ? \ TSS2_TCTI_RC_ABI_MISMATCH: \ (TSS2_TCTI_GET_POLL_HANDLES(tctiContext) == NULL) ? \ TSS2_TCTI_RC_NOT_IMPLEMENTED: \ TSS2_TCTI_GET_POLL_HANDLES(tctiContext)(tctiContext, handles, num_handles)) #define Tss2_Tcti_SetLocality(tctiContext, locality) \ - ((tctiContext == NULL) ? TSS2_TCTI_RC_BAD_REFERENCE: \ + (((tctiContext) == NULL) ? TSS2_TCTI_RC_BAD_REFERENCE: \ (TSS2_TCTI_VERSION(tctiContext) < 1) ? \ TSS2_TCTI_RC_ABI_MISMATCH: \ (TSS2_TCTI_SET_LOCALITY(tctiContext) == NULL) ? \ TSS2_TCTI_RC_NOT_IMPLEMENTED: \ TSS2_TCTI_SET_LOCALITY(tctiContext)(tctiContext, locality)) #define Tss2_Tcti_MakeSticky(tctiContext, handle, sticky) \ - ((tctiContext == NULL) ? TSS2_TCTI_RC_BAD_REFERENCE: \ + (((tctiContext) == NULL) ? TSS2_TCTI_RC_BAD_REFERENCE: \ (TSS2_TCTI_VERSION(tctiContext) < 2) ? \ TSS2_TCTI_RC_ABI_MISMATCH: \ (TSS2_TCTI_MAKE_STICKY(tctiContext) == NULL) ? \ diff --git a/src/tss2-esys/api/Esys_ACT_SetTimeout.c b/src/tss2-esys/api/Esys_ACT_SetTimeout.c index 31e4158cf..011897234 100644 --- a/src/tss2-esys/api/Esys_ACT_SetTimeout.c +++ b/src/tss2-esys/api/Esys_ACT_SetTimeout.c @@ -164,26 +164,26 @@ Esys_ACT_SetTimeout_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, actHandle, &actHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "actHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "actHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_ACT_SetTimeout_Prepare(esysContext->sys, (actHandleNode == NULL) ? TPM2_RH_NULL : actHandleNode->rsrc.handle, startTimeout); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (actHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &actHandleNode->rsrc.name, &actHandleNode->auth); @@ -195,21 +195,21 @@ Esys_ACT_SetTimeout_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, actHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -253,18 +253,18 @@ Esys_ACT_SetTimeout_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -272,12 +272,12 @@ Esys_ACT_SetTimeout_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -292,11 +292,11 @@ Esys_ACT_SetTimeout_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -305,7 +305,7 @@ Esys_ACT_SetTimeout_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -313,10 +313,10 @@ Esys_ACT_SetTimeout_Finish( * to deliver the result. */ r = Tss2_Sys_ACT_SetTimeout_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_AC_GetCapability.c b/src/tss2-esys/api/Esys_AC_GetCapability.c index 501e2b2fa..940c931b6 100644 --- a/src/tss2-esys/api/Esys_AC_GetCapability.c +++ b/src/tss2-esys/api/Esys_AC_GetCapability.c @@ -156,12 +156,12 @@ TSS2_RC Esys_AC_GetCapability_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(optionalSession1, optionalSession2, optionalSession3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); TPMI_RH_AC ac_id; r = iesys_handle_to_tpm_handle(ac, &ac_id); @@ -170,33 +170,33 @@ TSS2_RC Esys_AC_GetCapability_Async( /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_AC_GetCapability_Prepare(esysContext->sys, ac_id, capability, count); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, optionalSession1, optionalSession2, optionalSession3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources");\ + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources");\ iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, NULL, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -245,12 +245,12 @@ TSS2_RC Esys_AC_GetCapability_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (capabilityData != NULL) { @@ -264,7 +264,7 @@ TSS2_RC Esys_AC_GetCapability_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -272,12 +272,12 @@ TSS2_RC Esys_AC_GetCapability_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -292,11 +292,11 @@ TSS2_RC Esys_AC_GetCapability_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -305,7 +305,7 @@ TSS2_RC Esys_AC_GetCapability_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -315,11 +315,11 @@ TSS2_RC Esys_AC_GetCapability_Finish( r = Tss2_Sys_AC_GetCapability_Complete(esysContext->sys, moreData, (capabilityData != NULL) ? *capabilityData : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_AC_Send.c b/src/tss2-esys/api/Esys_AC_Send.c index 514d1c2f3..6bc4d399d 100644 --- a/src/tss2-esys/api/Esys_AC_Send.c +++ b/src/tss2-esys/api/Esys_AC_Send.c @@ -157,12 +157,12 @@ TSS2_RC Esys_AC_Send_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(optionalSession1, optionalSession2, optionalSession3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /** * Convert inputs here @@ -183,33 +183,33 @@ TSS2_RC Esys_AC_Send_Async( /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_AC_Send_Prepare(esysContext->sys, tpmi_sendObject, tpmi_nvAuthHandle, tpmi_ac, acDataIn); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, optionalSession1, optionalSession2, optionalSession3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources");\ + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources");\ iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, NULL, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -254,12 +254,12 @@ TSS2_RC Esys_AC_Send_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (acDataOut != NULL) { @@ -273,7 +273,7 @@ TSS2_RC Esys_AC_Send_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } @@ -282,12 +282,12 @@ TSS2_RC Esys_AC_Send_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -302,11 +302,11 @@ TSS2_RC Esys_AC_Send_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -315,7 +315,7 @@ TSS2_RC Esys_AC_Send_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -324,10 +324,10 @@ TSS2_RC Esys_AC_Send_Finish( */ r = Tss2_Sys_AC_Send_Complete(esysContext->sys, (acDataOut != NULL) ? *acDataOut : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_ActivateCredential.c b/src/tss2-esys/api/Esys_ActivateCredential.c index c032447e8..d971df189 100644 --- a/src/tss2-esys/api/Esys_ActivateCredential.c +++ b/src/tss2-esys/api/Esys_ActivateCredential.c @@ -171,17 +171,17 @@ Esys_ActivateCredential_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, activateHandle, &activateHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "activateHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "activateHandle unknown."); r = esys_GetResourceObject(esysContext, keyHandle, &keyHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "keyHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "keyHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_ActivateCredential_Prepare(esysContext->sys, @@ -192,11 +192,11 @@ Esys_ActivateCredential_Async( ? TPM2_RH_NULL : keyHandleNode->rsrc.handle, credentialBlob, secret); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (activateHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &activateHandleNode->rsrc.name, &activateHandleNode->auth); @@ -212,21 +212,21 @@ Esys_ActivateCredential_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, activateHandleNode, keyHandleNode, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -275,12 +275,12 @@ Esys_ActivateCredential_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (certInfo != NULL) { @@ -294,7 +294,7 @@ Esys_ActivateCredential_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -302,12 +302,12 @@ Esys_ActivateCredential_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -322,11 +322,11 @@ Esys_ActivateCredential_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -335,7 +335,7 @@ Esys_ActivateCredential_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -345,11 +345,11 @@ Esys_ActivateCredential_Finish( r = Tss2_Sys_ActivateCredential_Complete(esysContext->sys, (certInfo != NULL) ? *certInfo : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_Certify.c b/src/tss2-esys/api/Esys_Certify.c index edec64d46..7d88ef172 100644 --- a/src/tss2-esys/api/Esys_Certify.c +++ b/src/tss2-esys/api/Esys_Certify.c @@ -172,17 +172,17 @@ Esys_Certify_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, objectHandle, &objectHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "objectHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "objectHandle unknown."); r = esys_GetResourceObject(esysContext, signHandle, &signHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "signHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "signHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_Certify_Prepare(esysContext->sys, @@ -191,11 +191,11 @@ Esys_Certify_Async( (signHandleNode == NULL) ? TPM2_RH_NULL : signHandleNode->rsrc.handle, qualifyingData, inScheme); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (objectHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &objectHandleNode->rsrc.name, &objectHandleNode->auth); @@ -212,21 +212,21 @@ Esys_Certify_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, objectHandleNode, signHandleNode, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -279,12 +279,12 @@ Esys_Certify_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (certifyInfo != NULL) { @@ -304,7 +304,7 @@ Esys_Certify_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -312,12 +312,12 @@ Esys_Certify_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -332,11 +332,11 @@ Esys_Certify_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -345,7 +345,7 @@ Esys_Certify_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -355,11 +355,11 @@ Esys_Certify_Finish( r = Tss2_Sys_Certify_Complete(esysContext->sys, (certifyInfo != NULL) ? *certifyInfo : NULL, (signature != NULL) ? *signature : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_CertifyCreation.c b/src/tss2-esys/api/Esys_CertifyCreation.c index 7b3caa774..f683ead26 100644 --- a/src/tss2-esys/api/Esys_CertifyCreation.c +++ b/src/tss2-esys/api/Esys_CertifyCreation.c @@ -186,17 +186,17 @@ Esys_CertifyCreation_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, signHandle, &signHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "signHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "signHandle unknown."); r = esys_GetResourceObject(esysContext, objectHandle, &objectHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "objectHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "objectHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_CertifyCreation_Prepare(esysContext->sys, @@ -207,11 +207,11 @@ Esys_CertifyCreation_Async( : objectHandleNode->rsrc.handle, qualifyingData, creationHash, inScheme, creationTicket); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (signHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &signHandleNode->rsrc.name, &signHandleNode->auth); @@ -223,21 +223,21 @@ Esys_CertifyCreation_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, signHandleNode, objectHandleNode, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -289,12 +289,12 @@ Esys_CertifyCreation_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (certifyInfo != NULL) { @@ -314,7 +314,7 @@ Esys_CertifyCreation_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -322,12 +322,12 @@ Esys_CertifyCreation_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -342,11 +342,11 @@ Esys_CertifyCreation_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -355,7 +355,7 @@ Esys_CertifyCreation_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -367,11 +367,11 @@ Esys_CertifyCreation_Finish( : NULL, (signature != NULL) ? *signature : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_CertifyX509.c b/src/tss2-esys/api/Esys_CertifyX509.c index 72f02bd34..c4c289239 100644 --- a/src/tss2-esys/api/Esys_CertifyX509.c +++ b/src/tss2-esys/api/Esys_CertifyX509.c @@ -179,17 +179,17 @@ Esys_CertifyX509_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, objectHandle, &objectHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "objectHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "objectHandle unknown."); r = esys_GetResourceObject(esysContext, signHandle, &signHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "signHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "signHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_CertifyX509_Prepare(esysContext->sys, @@ -198,11 +198,11 @@ Esys_CertifyX509_Async( (signHandleNode == NULL) ? TPM2_RH_NULL : signHandleNode->rsrc.handle, reserved, inScheme, partialCertificate); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (objectHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &objectHandleNode->rsrc.name, &objectHandleNode->auth); @@ -219,21 +219,21 @@ Esys_CertifyX509_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, objectHandleNode, signHandleNode, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -287,12 +287,12 @@ Esys_CertifyX509_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (addedToCertificate != NULL) { @@ -318,7 +318,7 @@ Esys_CertifyX509_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -326,12 +326,12 @@ Esys_CertifyX509_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -346,11 +346,11 @@ Esys_CertifyX509_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -359,7 +359,7 @@ Esys_CertifyX509_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -370,11 +370,11 @@ Esys_CertifyX509_Finish( (addedToCertificate != NULL) ? *addedToCertificate : NULL, (tbsDigest != NULL) ? *tbsDigest : NULL, (signature != NULL) ? *signature : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_ChangeEPS.c b/src/tss2-esys/api/Esys_ChangeEPS.c index 67a00fdea..1f4d3972e 100644 --- a/src/tss2-esys/api/Esys_ChangeEPS.c +++ b/src/tss2-esys/api/Esys_ChangeEPS.c @@ -159,25 +159,25 @@ Esys_ChangeEPS_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, authHandle, &authHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_ChangeEPS_Prepare(esysContext->sys, (authHandleNode == NULL) ? TPM2_RH_NULL : authHandleNode->rsrc.handle); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authHandleNode->rsrc.name, &authHandleNode->auth); @@ -189,21 +189,21 @@ Esys_ChangeEPS_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -249,18 +249,18 @@ Esys_ChangeEPS_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -268,12 +268,12 @@ Esys_ChangeEPS_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -288,11 +288,11 @@ Esys_ChangeEPS_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -301,7 +301,7 @@ Esys_ChangeEPS_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -309,10 +309,10 @@ Esys_ChangeEPS_Finish( * to deliver the result. */ r = Tss2_Sys_ChangeEPS_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_ChangePPS.c b/src/tss2-esys/api/Esys_ChangePPS.c index 220aaea9a..443bdcf86 100644 --- a/src/tss2-esys/api/Esys_ChangePPS.c +++ b/src/tss2-esys/api/Esys_ChangePPS.c @@ -159,25 +159,25 @@ Esys_ChangePPS_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, authHandle, &authHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_ChangePPS_Prepare(esysContext->sys, (authHandleNode == NULL) ? TPM2_RH_NULL : authHandleNode->rsrc.handle); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authHandleNode->rsrc.name, &authHandleNode->auth); @@ -189,21 +189,21 @@ Esys_ChangePPS_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -249,18 +249,18 @@ Esys_ChangePPS_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -268,12 +268,12 @@ Esys_ChangePPS_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -288,11 +288,11 @@ Esys_ChangePPS_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -301,7 +301,7 @@ Esys_ChangePPS_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -309,10 +309,10 @@ Esys_ChangePPS_Finish( * to deliver the result. */ r = Tss2_Sys_ChangePPS_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_Clear.c b/src/tss2-esys/api/Esys_Clear.c index 2abead8a8..468646350 100644 --- a/src/tss2-esys/api/Esys_Clear.c +++ b/src/tss2-esys/api/Esys_Clear.c @@ -158,25 +158,25 @@ Esys_Clear_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, authHandle, &authHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_Clear_Prepare(esysContext->sys, (authHandleNode == NULL) ? TPM2_RH_NULL : authHandleNode->rsrc.handle); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authHandleNode->rsrc.name, &authHandleNode->auth); @@ -188,18 +188,18 @@ Esys_Clear_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); /* If the command authorization is LOCKOUT we need to @@ -207,7 +207,7 @@ Esys_Clear_Async( if (authHandle == ESYS_TR_RH_LOCKOUT) iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -253,18 +253,18 @@ Esys_Clear_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -272,12 +272,12 @@ Esys_Clear_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -292,11 +292,11 @@ Esys_Clear_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -305,7 +305,7 @@ Esys_Clear_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -313,10 +313,10 @@ Esys_Clear_Finish( * to deliver the result. */ r = Tss2_Sys_Clear_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_ClearControl.c b/src/tss2-esys/api/Esys_ClearControl.c index 1f2e2bb03..c54f73731 100644 --- a/src/tss2-esys/api/Esys_ClearControl.c +++ b/src/tss2-esys/api/Esys_ClearControl.c @@ -165,25 +165,25 @@ Esys_ClearControl_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, auth, &authNode); - return_state_if_error(r, _ESYS_STATE_INIT, "auth unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "auth unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_ClearControl_Prepare(esysContext->sys, (authNode == NULL) ? TPM2_RH_NULL : authNode->rsrc.handle, disable); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authNode->rsrc.name, &authNode->auth); @@ -195,21 +195,21 @@ Esys_ClearControl_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -255,18 +255,18 @@ Esys_ClearControl_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -274,12 +274,12 @@ Esys_ClearControl_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -294,11 +294,11 @@ Esys_ClearControl_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -307,7 +307,7 @@ Esys_ClearControl_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -315,10 +315,10 @@ Esys_ClearControl_Finish( * to deliver the result. */ r = Tss2_Sys_ClearControl_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_ClockRateAdjust.c b/src/tss2-esys/api/Esys_ClockRateAdjust.c index 0db66034b..f70f2775c 100644 --- a/src/tss2-esys/api/Esys_ClockRateAdjust.c +++ b/src/tss2-esys/api/Esys_ClockRateAdjust.c @@ -163,25 +163,25 @@ Esys_ClockRateAdjust_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, auth, &authNode); - return_state_if_error(r, _ESYS_STATE_INIT, "auth unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "auth unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_ClockRateAdjust_Prepare(esysContext->sys, (authNode == NULL) ? TPM2_RH_NULL : authNode->rsrc.handle, rateAdjust); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authNode->rsrc.name, &authNode->auth); @@ -193,21 +193,21 @@ Esys_ClockRateAdjust_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -253,18 +253,18 @@ Esys_ClockRateAdjust_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -272,12 +272,12 @@ Esys_ClockRateAdjust_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -292,11 +292,11 @@ Esys_ClockRateAdjust_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -305,7 +305,7 @@ Esys_ClockRateAdjust_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -313,10 +313,10 @@ Esys_ClockRateAdjust_Finish( * to deliver the result. */ r = Tss2_Sys_ClockRateAdjust_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_ClockSet.c b/src/tss2-esys/api/Esys_ClockSet.c index a06345801..1d44465a0 100644 --- a/src/tss2-esys/api/Esys_ClockSet.c +++ b/src/tss2-esys/api/Esys_ClockSet.c @@ -163,25 +163,25 @@ Esys_ClockSet_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, auth, &authNode); - return_state_if_error(r, _ESYS_STATE_INIT, "auth unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "auth unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_ClockSet_Prepare(esysContext->sys, (authNode == NULL) ? TPM2_RH_NULL : authNode->rsrc.handle, newTime); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authNode->rsrc.name, &authNode->auth); @@ -193,21 +193,21 @@ Esys_ClockSet_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -253,18 +253,18 @@ Esys_ClockSet_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -272,12 +272,12 @@ Esys_ClockSet_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -292,11 +292,11 @@ Esys_ClockSet_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -305,7 +305,7 @@ Esys_ClockSet_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -313,10 +313,10 @@ Esys_ClockSet_Finish( * to deliver the result. */ r = Tss2_Sys_ClockSet_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_Commit.c b/src/tss2-esys/api/Esys_Commit.c index 5d75589f7..1d2724c42 100644 --- a/src/tss2-esys/api/Esys_Commit.c +++ b/src/tss2-esys/api/Esys_Commit.c @@ -173,25 +173,25 @@ Esys_Commit_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, signHandle, &signHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "signHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "signHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_Commit_Prepare(esysContext->sys, (signHandleNode == NULL) ? TPM2_RH_NULL : signHandleNode->rsrc.handle, P1, s2, y2); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (signHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &signHandleNode->rsrc.name, &signHandleNode->auth); @@ -203,21 +203,21 @@ Esys_Commit_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, signHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -276,12 +276,12 @@ Esys_Commit_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Initialize parameter to avoid unitialized usage */ if (E != NULL) @@ -311,7 +311,7 @@ Esys_Commit_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -319,12 +319,12 @@ Esys_Commit_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -339,11 +339,11 @@ Esys_Commit_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -352,7 +352,7 @@ Esys_Commit_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -363,11 +363,11 @@ Esys_Commit_Finish( (K != NULL) ? *K : NULL, (L != NULL) ? *L : NULL, (E != NULL) ? *E : NULL, counter); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_ContextLoad.c b/src/tss2-esys/api/Esys_ContextLoad.c index 7867fae96..6f964ed9b 100644 --- a/src/tss2-esys/api/Esys_ContextLoad.c +++ b/src/tss2-esys/api/Esys_ContextLoad.c @@ -136,7 +136,7 @@ Esys_ContextLoad_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; store_input_parameters(esysContext, context); size_t offset = 0; @@ -169,13 +169,13 @@ Esys_ContextLoad_Async( /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_ContextLoad_Prepare(esysContext->sys, context); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -222,12 +222,12 @@ Esys_ContextLoad_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; RSRC_NODE_T *loadedHandleNode = NULL; /* Allocate memory for response parameters */ @@ -253,7 +253,7 @@ Esys_ContextLoad_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -261,12 +261,12 @@ Esys_ContextLoad_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -281,20 +281,20 @@ Esys_ContextLoad_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } r = Tss2_Sys_ContextLoad_Complete(esysContext->sys, &loadedHandleNode->rsrc.handle); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_ContextSave.c b/src/tss2-esys/api/Esys_ContextSave.c index de4c99d7f..22202bb08 100644 --- a/src/tss2-esys/api/Esys_ContextSave.c +++ b/src/tss2-esys/api/Esys_ContextSave.c @@ -138,24 +138,24 @@ Esys_ContextSave_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; store_input_parameters(esysContext, saveHandle); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, saveHandle, &saveHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "saveHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "saveHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_ContextSave_Prepare(esysContext->sys, (saveHandleNode == NULL) ? TPM2_RH_NULL : saveHandleNode->rsrc.handle); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -205,12 +205,12 @@ Esys_ContextSave_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ lcontext = calloc(1, sizeof(TPMS_CONTEXT)); @@ -222,7 +222,7 @@ Esys_ContextSave_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -230,12 +230,12 @@ Esys_ContextSave_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -250,15 +250,15 @@ Esys_ContextSave_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } r = Tss2_Sys_ContextSave_Complete(esysContext->sys, lcontext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); @@ -297,7 +297,7 @@ Esys_ContextSave_Finish( else SAFE_FREE(lcontext); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_Create.c b/src/tss2-esys/api/Esys_Create.c index ec70c0dd5..aafdcc8ea 100644 --- a/src/tss2-esys/api/Esys_Create.c +++ b/src/tss2-esys/api/Esys_Create.c @@ -201,11 +201,11 @@ Esys_Create_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters (esysContext, inSensitive); if (inPublic) { @@ -213,12 +213,12 @@ Esys_Create_Async( &esysContext->crypto_backend, &esysContext->in.Create.inSensitive->sensitive.userAuth, inPublic->publicArea.nameAlg); - return_state_if_error(r, _ESYS_STATE_INIT, "Adapt auth value."); + return_state_if_error(r, ESYS_STATE_INIT, "Adapt auth value."); } /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, parentHandle, &parentHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "parentHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "parentHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_Create_Prepare(esysContext->sys, @@ -226,11 +226,11 @@ Esys_Create_Async( : parentHandleNode->rsrc.handle, esysContext->in.Create.inSensitive, inPublic, outsideInfo, creationPCR); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (parentHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], @@ -243,21 +243,21 @@ Esys_Create_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, parentHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -321,12 +321,12 @@ Esys_Create_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Initialize parameter to avoid unitialized usage */ if (creationData != NULL) @@ -372,7 +372,7 @@ Esys_Create_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -380,12 +380,12 @@ Esys_Create_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -400,11 +400,11 @@ Esys_Create_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -413,7 +413,7 @@ Esys_Create_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -427,11 +427,11 @@ Esys_Create_Finish( (creationHash != NULL) ? *creationHash : NULL, (creationTicket != NULL) ? *creationTicket : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_CreateLoaded.c b/src/tss2-esys/api/Esys_CreateLoaded.c index 8d6bf9ffb..b77931971 100644 --- a/src/tss2-esys/api/Esys_CreateLoaded.c +++ b/src/tss2-esys/api/Esys_CreateLoaded.c @@ -195,11 +195,11 @@ Esys_CreateLoaded_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters(esysContext, inSensitive, inPublic); if (inPublic) { @@ -211,23 +211,23 @@ Esys_CreateLoaded_Async( &esysContext->crypto_backend, &esysContext->in.CreateLoaded.inSensitive->sensitive.userAuth, publicArea.nameAlg); - return_state_if_error(r, _ESYS_STATE_INIT, "Adapt auth value."); + return_state_if_error(r, ESYS_STATE_INIT, "Adapt auth value."); } /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, parentHandle, &parentHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "parentHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "parentHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_CreateLoaded_Prepare(esysContext->sys, (parentHandleNode == NULL) ? TPM2_RH_NULL : parentHandleNode->rsrc.handle, esysContext->in.CreateLoaded.inSensitive, inPublic); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (parentHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &parentHandleNode->rsrc.name, &parentHandleNode->auth); @@ -239,21 +239,21 @@ Esys_CreateLoaded_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, parentHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -309,12 +309,12 @@ Esys_CreateLoaded_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; TPM2B_NAME name; RSRC_NODE_T *objectHandleNode = NULL; @@ -343,7 +343,7 @@ Esys_CreateLoaded_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -351,12 +351,12 @@ Esys_CreateLoaded_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -371,11 +371,11 @@ Esys_CreateLoaded_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -384,7 +384,7 @@ Esys_CreateLoaded_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -395,7 +395,7 @@ Esys_CreateLoaded_Finish( &objectHandleNode->rsrc.handle, (outPrivate != NULL) ? *outPrivate : NULL, loutPublic, &name); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); @@ -417,7 +417,7 @@ Esys_CreateLoaded_Finish( else SAFE_FREE(loutPublic); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_CreatePrimary.c b/src/tss2-esys/api/Esys_CreatePrimary.c index dbfb27e6d..aaef71da9 100644 --- a/src/tss2-esys/api/Esys_CreatePrimary.c +++ b/src/tss2-esys/api/Esys_CreatePrimary.c @@ -204,23 +204,23 @@ Esys_CreatePrimary_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters (esysContext, inSensitive); if (inPublic) { r = iesys_adapt_auth_value( &esysContext->crypto_backend, &esysContext->in.CreatePrimary.inSensitive->sensitive.userAuth, inPublic->publicArea.nameAlg); - return_state_if_error(r, _ESYS_STATE_INIT, "Adapt auth value."); + return_state_if_error(r, ESYS_STATE_INIT, "Adapt auth value."); } /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, primaryHandle, &primaryHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "primaryHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "primaryHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_CreatePrimary_Prepare(esysContext->sys, @@ -229,11 +229,11 @@ Esys_CreatePrimary_Async( esysContext->in.CreatePrimary.inSensitive, inPublic, outsideInfo, creationPCR); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (primaryHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &primaryHandleNode->rsrc.name, &primaryHandleNode->auth); @@ -245,21 +245,21 @@ Esys_CreatePrimary_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, primaryHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -322,12 +322,12 @@ Esys_CreatePrimary_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; TPM2B_NAME name; RSRC_NODE_T *objectHandleNode = NULL; @@ -374,7 +374,7 @@ Esys_CreatePrimary_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -382,12 +382,12 @@ Esys_CreatePrimary_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -402,11 +402,11 @@ Esys_CreatePrimary_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -415,7 +415,7 @@ Esys_CreatePrimary_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -431,7 +431,7 @@ Esys_CreatePrimary_Finish( : NULL, (creationTicket != NULL) ? *creationTicket : NULL, &name); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); @@ -451,7 +451,7 @@ Esys_CreatePrimary_Finish( else SAFE_FREE(loutPublic); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_DictionaryAttackLockReset.c b/src/tss2-esys/api/Esys_DictionaryAttackLockReset.c index d670e5829..a5e6893d3 100644 --- a/src/tss2-esys/api/Esys_DictionaryAttackLockReset.c +++ b/src/tss2-esys/api/Esys_DictionaryAttackLockReset.c @@ -159,26 +159,26 @@ Esys_DictionaryAttackLockReset_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, lockHandle, &lockHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "lockHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "lockHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_DictionaryAttackLockReset_Prepare(esysContext->sys, (lockHandleNode == NULL) ? TPM2_RH_NULL : lockHandleNode->rsrc.handle); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (lockHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &lockHandleNode->rsrc.name, &lockHandleNode->auth); @@ -190,21 +190,21 @@ Esys_DictionaryAttackLockReset_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, lockHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -250,18 +250,18 @@ Esys_DictionaryAttackLockReset_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -269,12 +269,12 @@ Esys_DictionaryAttackLockReset_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -289,11 +289,11 @@ Esys_DictionaryAttackLockReset_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -302,7 +302,7 @@ Esys_DictionaryAttackLockReset_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -310,10 +310,10 @@ Esys_DictionaryAttackLockReset_Finish( * to deliver the result. */ r = Tss2_Sys_DictionaryAttackLockReset_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_DictionaryAttackParameters.c b/src/tss2-esys/api/Esys_DictionaryAttackParameters.c index 494593a3e..f59695794 100644 --- a/src/tss2-esys/api/Esys_DictionaryAttackParameters.c +++ b/src/tss2-esys/api/Esys_DictionaryAttackParameters.c @@ -179,15 +179,15 @@ Esys_DictionaryAttackParameters_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, lockHandle, &lockHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "lockHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "lockHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_DictionaryAttackParameters_Prepare(esysContext->sys, @@ -196,11 +196,11 @@ Esys_DictionaryAttackParameters_Async( : lockHandleNode->rsrc.handle, newMaxTries, newRecoveryTime, lockoutRecovery); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (lockHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &lockHandleNode->rsrc.name, &lockHandleNode->auth); @@ -212,21 +212,21 @@ Esys_DictionaryAttackParameters_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, lockHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -272,18 +272,18 @@ Esys_DictionaryAttackParameters_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -291,12 +291,12 @@ Esys_DictionaryAttackParameters_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -311,11 +311,11 @@ Esys_DictionaryAttackParameters_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -324,7 +324,7 @@ Esys_DictionaryAttackParameters_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -332,10 +332,10 @@ Esys_DictionaryAttackParameters_Finish( * to deliver the result. */ r = Tss2_Sys_DictionaryAttackParameters_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_Duplicate.c b/src/tss2-esys/api/Esys_Duplicate.c index bbf07495d..db9555459 100644 --- a/src/tss2-esys/api/Esys_Duplicate.c +++ b/src/tss2-esys/api/Esys_Duplicate.c @@ -181,17 +181,17 @@ Esys_Duplicate_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, objectHandle, &objectHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "objectHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "objectHandle unknown."); r = esys_GetResourceObject(esysContext, newParentHandle, &newParentHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "newParentHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "newParentHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_Duplicate_Prepare(esysContext->sys, @@ -200,11 +200,11 @@ Esys_Duplicate_Async( (newParentHandleNode == NULL) ? TPM2_RH_NULL : newParentHandleNode->rsrc.handle, encryptionKeyIn, symmetricAlg); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (objectHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &objectHandleNode->rsrc.name, &objectHandleNode->auth); @@ -216,21 +216,21 @@ Esys_Duplicate_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, objectHandleNode, newParentHandleNode, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -292,12 +292,12 @@ Esys_Duplicate_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Initialize parameter to avoid unitialized usage */ if (outSymSeed != NULL) @@ -327,7 +327,7 @@ Esys_Duplicate_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -335,12 +335,12 @@ Esys_Duplicate_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -355,11 +355,11 @@ Esys_Duplicate_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -368,7 +368,7 @@ Esys_Duplicate_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -380,11 +380,11 @@ Esys_Duplicate_Finish( ? *encryptionKeyOut : NULL, (duplicate != NULL) ? *duplicate : NULL, (outSymSeed != NULL) ? *outSymSeed : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_ECC_Parameters.c b/src/tss2-esys/api/Esys_ECC_Parameters.c index 2cb58fc5a..7b1b47704 100644 --- a/src/tss2-esys/api/Esys_ECC_Parameters.c +++ b/src/tss2-esys/api/Esys_ECC_Parameters.c @@ -154,40 +154,40 @@ Esys_ECC_Parameters_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_ECC_Parameters_Prepare(esysContext->sys, curveID); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, NULL, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -236,12 +236,12 @@ Esys_ECC_Parameters_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (parameters != NULL) { @@ -255,7 +255,7 @@ Esys_ECC_Parameters_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -263,12 +263,12 @@ Esys_ECC_Parameters_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -283,11 +283,11 @@ Esys_ECC_Parameters_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -296,7 +296,7 @@ Esys_ECC_Parameters_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -306,11 +306,11 @@ Esys_ECC_Parameters_Finish( r = Tss2_Sys_ECC_Parameters_Complete(esysContext->sys, (parameters != NULL) ? *parameters : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_ECDH_KeyGen.c b/src/tss2-esys/api/Esys_ECDH_KeyGen.c index cee54e74b..409194374 100644 --- a/src/tss2-esys/api/Esys_ECDH_KeyGen.c +++ b/src/tss2-esys/api/Esys_ECDH_KeyGen.c @@ -159,46 +159,46 @@ Esys_ECDH_KeyGen_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, keyHandle, &keyHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "keyHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "keyHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_ECDH_KeyGen_Prepare(esysContext->sys, (keyHandleNode == NULL) ? TPM2_RH_NULL : keyHandleNode->rsrc.handle); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, keyHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -250,12 +250,12 @@ Esys_ECDH_KeyGen_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (zPoint != NULL) { @@ -275,7 +275,7 @@ Esys_ECDH_KeyGen_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -283,12 +283,12 @@ Esys_ECDH_KeyGen_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -303,11 +303,11 @@ Esys_ECDH_KeyGen_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -316,7 +316,7 @@ Esys_ECDH_KeyGen_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -326,11 +326,11 @@ Esys_ECDH_KeyGen_Finish( r = Tss2_Sys_ECDH_KeyGen_Complete(esysContext->sys, (zPoint != NULL) ? *zPoint : NULL, (pubPoint != NULL) ? *pubPoint : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_ECDH_ZGen.c b/src/tss2-esys/api/Esys_ECDH_ZGen.c index 08c6c54ee..b2cdb7205 100644 --- a/src/tss2-esys/api/Esys_ECDH_ZGen.c +++ b/src/tss2-esys/api/Esys_ECDH_ZGen.c @@ -155,25 +155,25 @@ Esys_ECDH_ZGen_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, keyHandle, &keyHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "keyHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "keyHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_ECDH_ZGen_Prepare(esysContext->sys, (keyHandleNode == NULL) ? TPM2_RH_NULL : keyHandleNode->rsrc.handle, inPoint); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (keyHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &keyHandleNode->rsrc.name, &keyHandleNode->auth); @@ -185,21 +185,21 @@ Esys_ECDH_ZGen_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, keyHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -249,12 +249,12 @@ Esys_ECDH_ZGen_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (outPoint != NULL) { @@ -268,7 +268,7 @@ Esys_ECDH_ZGen_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -276,12 +276,12 @@ Esys_ECDH_ZGen_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -296,11 +296,11 @@ Esys_ECDH_ZGen_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -309,7 +309,7 @@ Esys_ECDH_ZGen_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -318,11 +318,11 @@ Esys_ECDH_ZGen_Finish( */ r = Tss2_Sys_ECDH_ZGen_Complete(esysContext->sys, (outPoint != NULL) ? *outPoint : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_EC_Ephemeral.c b/src/tss2-esys/api/Esys_EC_Ephemeral.c index e62c5dd34..5ba1e1e22 100644 --- a/src/tss2-esys/api/Esys_EC_Ephemeral.c +++ b/src/tss2-esys/api/Esys_EC_Ephemeral.c @@ -150,40 +150,40 @@ Esys_EC_Ephemeral_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_EC_Ephemeral_Prepare(esysContext->sys, curveID); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, NULL, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -234,12 +234,12 @@ Esys_EC_Ephemeral_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (Q != NULL) { @@ -253,7 +253,7 @@ Esys_EC_Ephemeral_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -261,12 +261,12 @@ Esys_EC_Ephemeral_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -281,11 +281,11 @@ Esys_EC_Ephemeral_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -294,7 +294,7 @@ Esys_EC_Ephemeral_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -303,11 +303,11 @@ Esys_EC_Ephemeral_Finish( */ r = Tss2_Sys_EC_Ephemeral_Complete(esysContext->sys, (Q != NULL) ? *Q : NULL, counter); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_EncryptDecrypt.c b/src/tss2-esys/api/Esys_EncryptDecrypt.c index 6a74499e5..1845081b8 100644 --- a/src/tss2-esys/api/Esys_EncryptDecrypt.c +++ b/src/tss2-esys/api/Esys_EncryptDecrypt.c @@ -179,26 +179,26 @@ Esys_EncryptDecrypt_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, keyHandle, &keyHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "keyHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "keyHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_EncryptDecrypt_Prepare(esysContext->sys, (keyHandleNode == NULL) ? TPM2_RH_NULL : keyHandleNode->rsrc.handle, decrypt, mode, ivIn, inData); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (keyHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &keyHandleNode->rsrc.name, &keyHandleNode->auth); @@ -210,21 +210,21 @@ Esys_EncryptDecrypt_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, keyHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -276,12 +276,12 @@ Esys_EncryptDecrypt_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (outData != NULL) { @@ -301,7 +301,7 @@ Esys_EncryptDecrypt_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -309,12 +309,12 @@ Esys_EncryptDecrypt_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -329,11 +329,11 @@ Esys_EncryptDecrypt_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -342,7 +342,7 @@ Esys_EncryptDecrypt_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -352,11 +352,11 @@ Esys_EncryptDecrypt_Finish( r = Tss2_Sys_EncryptDecrypt_Complete(esysContext->sys, (outData != NULL) ? *outData : NULL, (ivOut != NULL) ? *ivOut : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_EncryptDecrypt2.c b/src/tss2-esys/api/Esys_EncryptDecrypt2.c index 02a1cfdc8..c05548e05 100644 --- a/src/tss2-esys/api/Esys_EncryptDecrypt2.c +++ b/src/tss2-esys/api/Esys_EncryptDecrypt2.c @@ -173,26 +173,26 @@ Esys_EncryptDecrypt2_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, keyHandle, &keyHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "keyHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "keyHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_EncryptDecrypt2_Prepare(esysContext->sys, (keyHandleNode == NULL) ? TPM2_RH_NULL : keyHandleNode->rsrc.handle, inData, decrypt, mode, ivIn); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (keyHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &keyHandleNode->rsrc.name, &keyHandleNode->auth); @@ -204,21 +204,21 @@ Esys_EncryptDecrypt2_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, keyHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -270,12 +270,12 @@ Esys_EncryptDecrypt2_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (outData != NULL) { @@ -295,7 +295,7 @@ Esys_EncryptDecrypt2_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -303,12 +303,12 @@ Esys_EncryptDecrypt2_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -323,11 +323,11 @@ Esys_EncryptDecrypt2_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -336,7 +336,7 @@ Esys_EncryptDecrypt2_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -346,11 +346,11 @@ Esys_EncryptDecrypt2_Finish( r = Tss2_Sys_EncryptDecrypt2_Complete(esysContext->sys, (outData != NULL) ? *outData : NULL, (ivOut != NULL) ? *ivOut : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_EventSequenceComplete.c b/src/tss2-esys/api/Esys_EventSequenceComplete.c index cfd54c52e..427fcd400 100644 --- a/src/tss2-esys/api/Esys_EventSequenceComplete.c +++ b/src/tss2-esys/api/Esys_EventSequenceComplete.c @@ -166,17 +166,17 @@ Esys_EventSequenceComplete_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, pcrHandle, &pcrHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "pcrHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "pcrHandle unknown."); r = esys_GetResourceObject(esysContext, sequenceHandle, &sequenceHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "sequenceHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "sequenceHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_EventSequenceComplete_Prepare(esysContext->sys, @@ -187,11 +187,11 @@ Esys_EventSequenceComplete_Async( ? TPM2_RH_NULL : sequenceHandleNode->rsrc.handle, buffer); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (pcrHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &pcrHandleNode->rsrc.name, &pcrHandleNode->auth); @@ -208,21 +208,21 @@ Esys_EventSequenceComplete_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, pcrHandleNode, sequenceHandleNode, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -271,12 +271,12 @@ Esys_EventSequenceComplete_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (results != NULL) { @@ -290,7 +290,7 @@ Esys_EventSequenceComplete_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -298,12 +298,12 @@ Esys_EventSequenceComplete_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -318,11 +318,11 @@ Esys_EventSequenceComplete_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -331,7 +331,7 @@ Esys_EventSequenceComplete_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -341,11 +341,11 @@ Esys_EventSequenceComplete_Finish( r = Tss2_Sys_EventSequenceComplete_Complete(esysContext->sys, (results != NULL) ? *results : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_EvictControl.c b/src/tss2-esys/api/Esys_EvictControl.c index ee0b8e524..c4e6b5edf 100644 --- a/src/tss2-esys/api/Esys_EvictControl.c +++ b/src/tss2-esys/api/Esys_EvictControl.c @@ -182,18 +182,18 @@ Esys_EvictControl_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters(esysContext, objectHandle, persistentHandle); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, auth, &authNode); - return_state_if_error(r, _ESYS_STATE_INIT, "auth unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "auth unknown."); r = esys_GetResourceObject(esysContext, objectHandle, &objectHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "objectHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "objectHandle unknown."); /* Use resource handle if object is already persistent */ if (objectHandleNode != NULL && iesys_get_handle_type(objectHandleNode->rsrc.handle) == TPM2_HT_PERSISTENT) { @@ -207,11 +207,11 @@ Esys_EvictControl_Async( (objectHandleNode == NULL) ? TPM2_RH_NULL : objectHandleNode->rsrc.handle, persistentHandle); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authNode->rsrc.name, &authNode->auth); @@ -223,21 +223,21 @@ Esys_EvictControl_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authNode, objectHandleNode, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -284,12 +284,12 @@ Esys_EvictControl_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (newObjectHandle == NULL) { @@ -302,7 +302,7 @@ Esys_EvictControl_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } @@ -311,12 +311,12 @@ Esys_EvictControl_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -331,11 +331,11 @@ Esys_EvictControl_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -344,7 +344,7 @@ Esys_EvictControl_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -352,7 +352,7 @@ Esys_EvictControl_Finish( * to deliver the result. */ r = Tss2_Sys_EvictControl_Complete(esysContext->sys); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); @@ -377,7 +377,7 @@ Esys_EvictControl_Finish( newObjectHandleNode->rsrc = objectHandleNode->rsrc; newObjectHandleNode->rsrc.handle = esysContext->in.EvictControl.persistentHandle; } - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_FieldUpgradeData.c b/src/tss2-esys/api/Esys_FieldUpgradeData.c index be81289e2..2d80debfa 100644 --- a/src/tss2-esys/api/Esys_FieldUpgradeData.c +++ b/src/tss2-esys/api/Esys_FieldUpgradeData.c @@ -151,40 +151,40 @@ Esys_FieldUpgradeData_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_FieldUpgradeData_Prepare(esysContext->sys, fuData); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, NULL, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -236,12 +236,12 @@ Esys_FieldUpgradeData_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (nextDigest != NULL) { @@ -261,7 +261,7 @@ Esys_FieldUpgradeData_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -269,12 +269,12 @@ Esys_FieldUpgradeData_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -289,11 +289,11 @@ Esys_FieldUpgradeData_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -302,7 +302,7 @@ Esys_FieldUpgradeData_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -314,11 +314,11 @@ Esys_FieldUpgradeData_Finish( : NULL, (firstDigest != NULL) ? *firstDigest : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_FieldUpgradeStart.c b/src/tss2-esys/api/Esys_FieldUpgradeStart.c index 26d0ddaac..60f01395e 100644 --- a/src/tss2-esys/api/Esys_FieldUpgradeStart.c +++ b/src/tss2-esys/api/Esys_FieldUpgradeStart.c @@ -174,17 +174,17 @@ Esys_FieldUpgradeStart_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, authorization, &authorizationNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authorization unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authorization unknown."); r = esys_GetResourceObject(esysContext, keyHandle, &keyHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "keyHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "keyHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_FieldUpgradeStart_Prepare(esysContext->sys, @@ -194,11 +194,11 @@ Esys_FieldUpgradeStart_Async( (keyHandleNode == NULL) ? TPM2_RH_NULL : keyHandleNode->rsrc.handle, fuDigest, manifestSignature); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authorizationNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authorizationNode->rsrc.name, &authorizationNode->auth); @@ -210,21 +210,21 @@ Esys_FieldUpgradeStart_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authorizationNode, keyHandleNode, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -270,18 +270,18 @@ Esys_FieldUpgradeStart_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -289,12 +289,12 @@ Esys_FieldUpgradeStart_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -309,11 +309,11 @@ Esys_FieldUpgradeStart_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -322,7 +322,7 @@ Esys_FieldUpgradeStart_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -330,10 +330,10 @@ Esys_FieldUpgradeStart_Finish( * to deliver the result. */ r = Tss2_Sys_FieldUpgradeStart_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_FirmwareRead.c b/src/tss2-esys/api/Esys_FirmwareRead.c index 8e3bcc9a8..ac23cfd56 100644 --- a/src/tss2-esys/api/Esys_FirmwareRead.c +++ b/src/tss2-esys/api/Esys_FirmwareRead.c @@ -150,40 +150,40 @@ Esys_FirmwareRead_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_FirmwareRead_Prepare(esysContext->sys, sequenceNumber); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, NULL, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -232,12 +232,12 @@ Esys_FirmwareRead_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (fuData != NULL) { @@ -251,7 +251,7 @@ Esys_FirmwareRead_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -259,12 +259,12 @@ Esys_FirmwareRead_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -279,11 +279,11 @@ Esys_FirmwareRead_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -292,7 +292,7 @@ Esys_FirmwareRead_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -301,11 +301,11 @@ Esys_FirmwareRead_Finish( */ r = Tss2_Sys_FirmwareRead_Complete(esysContext->sys, (fuData != NULL) ? *fuData : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_FlushContext.c b/src/tss2-esys/api/Esys_FlushContext.c index 681eccb25..c5f5d704c 100644 --- a/src/tss2-esys/api/Esys_FlushContext.c +++ b/src/tss2-esys/api/Esys_FlushContext.c @@ -133,24 +133,24 @@ Esys_FlushContext_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; store_input_parameters(esysContext, flushHandle); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, flushHandle, &flushHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "flushHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "flushHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_FlushContext_Prepare(esysContext->sys, (flushHandleNode == NULL) ? TPM2_RH_NULL : flushHandleNode->rsrc.handle); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -197,18 +197,18 @@ Esys_FlushContext_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -216,12 +216,12 @@ Esys_FlushContext_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -236,28 +236,28 @@ Esys_FlushContext_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } r = Tss2_Sys_FlushContext_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); /* The ESYS_TR object has to be invalidated */ r = esys_GetResourceObject(esysContext, esysContext->in.FlushContext.flushHandle, &flushHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "flushHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "flushHandle unknown."); flushHandleNode->reference_count = 0; r = Esys_TR_Close(esysContext, &esysContext->in.FlushContext.flushHandle); return_if_error(r, "invalidate object"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_GetCapability.c b/src/tss2-esys/api/Esys_GetCapability.c index bba85d004..ca0516977 100644 --- a/src/tss2-esys/api/Esys_GetCapability.c +++ b/src/tss2-esys/api/Esys_GetCapability.c @@ -169,41 +169,41 @@ Esys_GetCapability_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_GetCapability_Prepare(esysContext->sys, capability, property, propertyCount); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, NULL, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -254,12 +254,12 @@ Esys_GetCapability_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (capabilityData != NULL) { @@ -273,7 +273,7 @@ Esys_GetCapability_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -281,12 +281,12 @@ Esys_GetCapability_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -301,11 +301,11 @@ Esys_GetCapability_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -314,7 +314,7 @@ Esys_GetCapability_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -324,11 +324,11 @@ Esys_GetCapability_Finish( r = Tss2_Sys_GetCapability_Complete(esysContext->sys, moreData, (capabilityData != NULL) ? *capabilityData : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_GetCommandAuditDigest.c b/src/tss2-esys/api/Esys_GetCommandAuditDigest.c index 92d677404..d3cc19826 100644 --- a/src/tss2-esys/api/Esys_GetCommandAuditDigest.c +++ b/src/tss2-esys/api/Esys_GetCommandAuditDigest.c @@ -173,17 +173,17 @@ Esys_GetCommandAuditDigest_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, privacyHandle, &privacyHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "privacyHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "privacyHandle unknown."); r = esys_GetResourceObject(esysContext, signHandle, &signHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "signHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "signHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_GetCommandAuditDigest_Prepare(esysContext->sys, @@ -194,11 +194,11 @@ Esys_GetCommandAuditDigest_Async( ? TPM2_RH_NULL : signHandleNode->rsrc.handle, qualifyingData, inScheme); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (privacyHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &privacyHandleNode->rsrc.name, &privacyHandleNode->auth); @@ -211,21 +211,21 @@ Esys_GetCommandAuditDigest_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, privacyHandleNode, signHandleNode, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -277,12 +277,12 @@ Esys_GetCommandAuditDigest_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (auditInfo != NULL) { @@ -302,7 +302,7 @@ Esys_GetCommandAuditDigest_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -310,12 +310,12 @@ Esys_GetCommandAuditDigest_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -330,11 +330,11 @@ Esys_GetCommandAuditDigest_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -343,7 +343,7 @@ Esys_GetCommandAuditDigest_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -355,11 +355,11 @@ Esys_GetCommandAuditDigest_Finish( : NULL, (signature != NULL) ? *signature : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_GetRandom.c b/src/tss2-esys/api/Esys_GetRandom.c index 35be79b8b..fb00e65b5 100644 --- a/src/tss2-esys/api/Esys_GetRandom.c +++ b/src/tss2-esys/api/Esys_GetRandom.c @@ -148,40 +148,40 @@ Esys_GetRandom_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_GetRandom_Prepare(esysContext->sys, bytesRequested); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, NULL, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -230,12 +230,12 @@ Esys_GetRandom_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (randomBytes != NULL) { @@ -249,7 +249,7 @@ Esys_GetRandom_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -257,12 +257,12 @@ Esys_GetRandom_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -277,11 +277,11 @@ Esys_GetRandom_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -290,7 +290,7 @@ Esys_GetRandom_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -300,11 +300,11 @@ Esys_GetRandom_Finish( r = Tss2_Sys_GetRandom_Complete(esysContext->sys, (randomBytes != NULL) ? *randomBytes : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_GetSessionAuditDigest.c b/src/tss2-esys/api/Esys_GetSessionAuditDigest.c index 7d7906795..0d07b44be 100644 --- a/src/tss2-esys/api/Esys_GetSessionAuditDigest.c +++ b/src/tss2-esys/api/Esys_GetSessionAuditDigest.c @@ -182,19 +182,19 @@ Esys_GetSessionAuditDigest_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, privacyAdminHandle, &privacyAdminHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "privacyAdminHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "privacyAdminHandle unknown."); r = esys_GetResourceObject(esysContext, signHandle, &signHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "signHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "signHandle unknown."); r = esys_GetResourceObject(esysContext, sessionHandle, &sessionHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "sessionHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "sessionHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_GetSessionAuditDigest_Prepare(esysContext->sys, @@ -208,11 +208,11 @@ Esys_GetSessionAuditDigest_Async( ? TPM2_RH_NULL : sessionHandleNode->rsrc.handle, qualifyingData, inScheme); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (privacyAdminHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &privacyAdminHandleNode->rsrc.name, &privacyAdminHandleNode->auth); @@ -225,21 +225,21 @@ Esys_GetSessionAuditDigest_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, privacyAdminHandleNode, signHandleNode, sessionHandleNode, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -291,12 +291,12 @@ Esys_GetSessionAuditDigest_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (auditInfo != NULL) { @@ -316,7 +316,7 @@ Esys_GetSessionAuditDigest_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -324,12 +324,12 @@ Esys_GetSessionAuditDigest_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -344,11 +344,11 @@ Esys_GetSessionAuditDigest_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -357,7 +357,7 @@ Esys_GetSessionAuditDigest_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -369,11 +369,11 @@ Esys_GetSessionAuditDigest_Finish( : NULL, (signature != NULL) ? *signature : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_GetTestResult.c b/src/tss2-esys/api/Esys_GetTestResult.c index 8df4aa5d3..893ee677c 100644 --- a/src/tss2-esys/api/Esys_GetTestResult.c +++ b/src/tss2-esys/api/Esys_GetTestResult.c @@ -145,40 +145,40 @@ Esys_GetTestResult_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_GetTestResult_Prepare(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, NULL, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -229,12 +229,12 @@ Esys_GetTestResult_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (outData != NULL) { @@ -248,7 +248,7 @@ Esys_GetTestResult_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -256,12 +256,12 @@ Esys_GetTestResult_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -276,11 +276,11 @@ Esys_GetTestResult_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -289,7 +289,7 @@ Esys_GetTestResult_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -299,11 +299,11 @@ Esys_GetTestResult_Finish( r = Tss2_Sys_GetTestResult_Complete(esysContext->sys, (outData != NULL) ? *outData : NULL, testResult); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_GetTime.c b/src/tss2-esys/api/Esys_GetTime.c index cc737154a..9c7601305 100644 --- a/src/tss2-esys/api/Esys_GetTime.c +++ b/src/tss2-esys/api/Esys_GetTime.c @@ -173,17 +173,17 @@ Esys_GetTime_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, privacyAdminHandle, &privacyAdminHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "privacyAdminHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "privacyAdminHandle unknown."); r = esys_GetResourceObject(esysContext, signHandle, &signHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "signHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "signHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_GetTime_Prepare(esysContext->sys, @@ -192,11 +192,11 @@ Esys_GetTime_Async( (signHandleNode == NULL) ? TPM2_RH_NULL : signHandleNode->rsrc.handle, qualifyingData, inScheme); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (privacyAdminHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &privacyAdminHandleNode->rsrc.name, &privacyAdminHandleNode->auth); @@ -209,21 +209,21 @@ Esys_GetTime_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, privacyAdminHandleNode, signHandleNode, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -275,12 +275,12 @@ Esys_GetTime_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (timeInfo != NULL) { @@ -300,7 +300,7 @@ Esys_GetTime_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -308,12 +308,12 @@ Esys_GetTime_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -328,11 +328,11 @@ Esys_GetTime_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -341,7 +341,7 @@ Esys_GetTime_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -351,11 +351,11 @@ Esys_GetTime_Finish( r = Tss2_Sys_GetTime_Complete(esysContext->sys, (timeInfo != NULL) ? *timeInfo : NULL, (signature != NULL) ? *signature : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_HMAC.c b/src/tss2-esys/api/Esys_HMAC.c index 6a161c60a..6b169e138 100644 --- a/src/tss2-esys/api/Esys_HMAC.c +++ b/src/tss2-esys/api/Esys_HMAC.c @@ -161,25 +161,25 @@ Esys_HMAC_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, handle, &handleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "handle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "handle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_HMAC_Prepare(esysContext->sys, (handleNode == NULL) ? TPM2_RH_NULL : handleNode->rsrc.handle, buffer, hashAlg); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (handleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &handleNode->rsrc.name, &handleNode->auth); @@ -191,21 +191,21 @@ Esys_HMAC_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, handleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -254,12 +254,12 @@ Esys_HMAC_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (outHMAC != NULL) { @@ -273,7 +273,7 @@ Esys_HMAC_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -281,12 +281,12 @@ Esys_HMAC_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -301,11 +301,11 @@ Esys_HMAC_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -314,7 +314,7 @@ Esys_HMAC_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -323,11 +323,11 @@ Esys_HMAC_Finish( */ r = Tss2_Sys_HMAC_Complete(esysContext->sys, (outHMAC != NULL) ? *outHMAC : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_HMAC_Start.c b/src/tss2-esys/api/Esys_HMAC_Start.c index 7bf8a1ad3..07ee42f7f 100644 --- a/src/tss2-esys/api/Esys_HMAC_Start.c +++ b/src/tss2-esys/api/Esys_HMAC_Start.c @@ -175,26 +175,26 @@ Esys_HMAC_Start_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters(esysContext, auth); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, handle, &handleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "handle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "handle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_HMAC_Start_Prepare(esysContext->sys, (handleNode == NULL) ? TPM2_RH_NULL : handleNode->rsrc.handle, auth, hashAlg); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (handleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &handleNode->rsrc.name, &handleNode->auth); @@ -206,21 +206,21 @@ Esys_HMAC_Start_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, handleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -267,12 +267,12 @@ Esys_HMAC_Start_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; RSRC_NODE_T *sequenceHandleNode = NULL; /* Allocate memory for response parameters */ @@ -290,7 +290,7 @@ Esys_HMAC_Start_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -298,12 +298,12 @@ Esys_HMAC_Start_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -318,11 +318,11 @@ Esys_HMAC_Start_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -331,7 +331,7 @@ Esys_HMAC_Start_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -340,7 +340,7 @@ Esys_HMAC_Start_Finish( */ r = Tss2_Sys_HMAC_Start_Complete(esysContext->sys, &sequenceHandleNode->rsrc.handle); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); @@ -350,7 +350,7 @@ Esys_HMAC_Start_Finish( /* Store the auth value parameter in the object meta data */ sequenceHandleNode->auth = esysContext->in.HMAC_Start.authData; - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_Hash.c b/src/tss2-esys/api/Esys_Hash.c index 0ff2a364b..2c6001513 100644 --- a/src/tss2-esys/api/Esys_Hash.c +++ b/src/tss2-esys/api/Esys_Hash.c @@ -167,40 +167,40 @@ Esys_Hash_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_Hash_Prepare(esysContext->sys, data, hashAlg, tpm_hierarchy); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, NULL, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -253,12 +253,12 @@ Esys_Hash_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (outHash != NULL) { @@ -278,7 +278,7 @@ Esys_Hash_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -286,12 +286,12 @@ Esys_Hash_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -306,11 +306,11 @@ Esys_Hash_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -319,7 +319,7 @@ Esys_Hash_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -329,11 +329,11 @@ Esys_Hash_Finish( r = Tss2_Sys_Hash_Complete(esysContext->sys, (outHash != NULL) ? *outHash : NULL, (validation != NULL) ? *validation : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_HashSequenceStart.c b/src/tss2-esys/api/Esys_HashSequenceStart.c index 34a0e8dbe..deb7da38a 100644 --- a/src/tss2-esys/api/Esys_HashSequenceStart.c +++ b/src/tss2-esys/api/Esys_HashSequenceStart.c @@ -151,40 +151,40 @@ Esys_HashSequenceStart_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_HashSequenceStart_Prepare(esysContext->sys, auth, hashAlg); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, NULL, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -231,12 +231,12 @@ Esys_HashSequenceStart_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; RSRC_NODE_T *sequenceHandleNode = NULL; /* Allocate memory for response parameters */ @@ -254,7 +254,7 @@ Esys_HashSequenceStart_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -262,12 +262,12 @@ Esys_HashSequenceStart_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -282,11 +282,11 @@ Esys_HashSequenceStart_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -295,7 +295,7 @@ Esys_HashSequenceStart_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -304,13 +304,13 @@ Esys_HashSequenceStart_Finish( */ r = Tss2_Sys_HashSequenceStart_Complete(esysContext->sys, &sequenceHandleNode->rsrc.handle); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); sequenceHandleNode->rsrc.name.size = 0; - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_HierarchyChangeAuth.c b/src/tss2-esys/api/Esys_HierarchyChangeAuth.c index eddefd94a..8617ac0c1 100644 --- a/src/tss2-esys/api/Esys_HierarchyChangeAuth.c +++ b/src/tss2-esys/api/Esys_HierarchyChangeAuth.c @@ -175,18 +175,18 @@ Esys_HierarchyChangeAuth_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters(esysContext, authHandle, newAuth); iesys_strip_trailing_zeros(&esysContext->in.HierarchyChangeAuth.newAuth); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, authHandle, &authHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_HierarchyChangeAuth_Prepare(esysContext->sys, @@ -194,11 +194,11 @@ Esys_HierarchyChangeAuth_Async( ? TPM2_RH_NULL : authHandleNode->rsrc.handle, &esysContext->in.HierarchyChangeAuth.newAuth); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authHandleNode->rsrc.name, &authHandleNode->auth); @@ -210,21 +210,21 @@ Esys_HierarchyChangeAuth_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -273,18 +273,18 @@ Esys_HierarchyChangeAuth_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -292,12 +292,12 @@ Esys_HierarchyChangeAuth_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -312,11 +312,11 @@ Esys_HierarchyChangeAuth_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } /* @@ -336,7 +336,7 @@ Esys_HierarchyChangeAuth_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -344,10 +344,10 @@ Esys_HierarchyChangeAuth_Finish( * to deliver the result. */ r = Tss2_Sys_HierarchyChangeAuth_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_HierarchyControl.c b/src/tss2-esys/api/Esys_HierarchyControl.c index 20bce6c4d..4b89f52e5 100644 --- a/src/tss2-esys/api/Esys_HierarchyControl.c +++ b/src/tss2-esys/api/Esys_HierarchyControl.c @@ -182,26 +182,26 @@ Esys_HierarchyControl_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, authHandle, &authHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_HierarchyControl_Prepare(esysContext->sys, (authHandleNode == NULL) ? TPM2_RH_NULL : authHandleNode->rsrc.handle, tpm_enable, state); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authHandleNode->rsrc.name, &authHandleNode->auth); @@ -213,21 +213,21 @@ Esys_HierarchyControl_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -273,18 +273,18 @@ Esys_HierarchyControl_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -292,12 +292,12 @@ Esys_HierarchyControl_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -312,11 +312,11 @@ Esys_HierarchyControl_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -325,7 +325,7 @@ Esys_HierarchyControl_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -333,10 +333,10 @@ Esys_HierarchyControl_Finish( * to deliver the result. */ r = Tss2_Sys_HierarchyControl_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_Import.c b/src/tss2-esys/api/Esys_Import.c index 61512c75e..7a9bf2927 100644 --- a/src/tss2-esys/api/Esys_Import.c +++ b/src/tss2-esys/api/Esys_Import.c @@ -181,15 +181,15 @@ Esys_Import_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, parentHandle, &parentHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "parentHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "parentHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_Import_Prepare(esysContext->sys, @@ -197,11 +197,11 @@ Esys_Import_Async( : parentHandleNode->rsrc.handle, encryptionKey, objectPublic, duplicate, inSymSeed, symmetricAlg); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (parentHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &parentHandleNode->rsrc.name, &parentHandleNode->auth); @@ -213,21 +213,21 @@ Esys_Import_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, parentHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -277,12 +277,12 @@ Esys_Import_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (outPrivate != NULL) { @@ -296,7 +296,7 @@ Esys_Import_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -304,12 +304,12 @@ Esys_Import_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -324,11 +324,11 @@ Esys_Import_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -337,7 +337,7 @@ Esys_Import_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -346,11 +346,11 @@ Esys_Import_Finish( */ r = Tss2_Sys_Import_Complete(esysContext->sys, (outPrivate != NULL) ? *outPrivate : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_IncrementalSelfTest.c b/src/tss2-esys/api/Esys_IncrementalSelfTest.c index cb46fed13..07c0753d8 100644 --- a/src/tss2-esys/api/Esys_IncrementalSelfTest.c +++ b/src/tss2-esys/api/Esys_IncrementalSelfTest.c @@ -154,40 +154,40 @@ Esys_IncrementalSelfTest_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_IncrementalSelfTest_Prepare(esysContext->sys, toTest); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, NULL, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -236,12 +236,12 @@ Esys_IncrementalSelfTest_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (toDoList != NULL) { @@ -255,7 +255,7 @@ Esys_IncrementalSelfTest_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -263,12 +263,12 @@ Esys_IncrementalSelfTest_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -283,11 +283,11 @@ Esys_IncrementalSelfTest_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -296,7 +296,7 @@ Esys_IncrementalSelfTest_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -306,11 +306,11 @@ Esys_IncrementalSelfTest_Finish( r = Tss2_Sys_IncrementalSelfTest_Complete(esysContext->sys, (toDoList != NULL) ? *toDoList : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_Load.c b/src/tss2-esys/api/Esys_Load.c index accac967c..0fd17e7e3 100644 --- a/src/tss2-esys/api/Esys_Load.c +++ b/src/tss2-esys/api/Esys_Load.c @@ -173,27 +173,27 @@ Esys_Load_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters(esysContext, inPublic); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, parentHandle, &parentHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "parentHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "parentHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_Load_Prepare(esysContext->sys, (parentHandleNode == NULL) ? TPM2_RH_NULL : parentHandleNode->rsrc.handle, inPrivate, inPublic); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (parentHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &parentHandleNode->rsrc.name, &parentHandleNode->auth); @@ -205,21 +205,21 @@ Esys_Load_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, parentHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -266,12 +266,12 @@ Esys_Load_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; TPM2B_NAME name; RSRC_NODE_T *objectHandleNode = NULL; @@ -297,7 +297,7 @@ Esys_Load_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -305,12 +305,12 @@ Esys_Load_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -325,11 +325,11 @@ Esys_Load_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -338,7 +338,7 @@ Esys_Load_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -347,7 +347,7 @@ Esys_Load_Finish( */ r = Tss2_Sys_Load_Complete(esysContext->sys, &objectHandleNode->rsrc.handle, &name); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); @@ -358,7 +358,7 @@ Esys_Load_Finish( "in Public name not equal name in response", error_cleanup); } objectHandleNode->rsrc.name = name; - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_LoadExternal.c b/src/tss2-esys/api/Esys_LoadExternal.c index a91c38b4e..550b5400d 100644 --- a/src/tss2-esys/api/Esys_LoadExternal.c +++ b/src/tss2-esys/api/Esys_LoadExternal.c @@ -174,42 +174,42 @@ Esys_LoadExternal_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters(esysContext, inPublic); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_LoadExternal_Prepare(esysContext->sys, inPrivate, inPublic, tpm_hierarchy); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, NULL, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -256,12 +256,12 @@ Esys_LoadExternal_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; TPM2B_NAME name; RSRC_NODE_T *objectHandleNode = NULL; @@ -287,7 +287,7 @@ Esys_LoadExternal_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -295,12 +295,12 @@ Esys_LoadExternal_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -315,11 +315,11 @@ Esys_LoadExternal_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -328,7 +328,7 @@ Esys_LoadExternal_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -337,7 +337,7 @@ Esys_LoadExternal_Finish( */ r = Tss2_Sys_LoadExternal_Complete(esysContext->sys, &objectHandleNode->rsrc.handle, &name); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); @@ -348,7 +348,7 @@ Esys_LoadExternal_Finish( "in Public name not equal name in response", error_cleanup); } objectHandleNode->rsrc.name = name; - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_MAC.c b/src/tss2-esys/api/Esys_MAC.c index 23433de8a..308c1a5a3 100644 --- a/src/tss2-esys/api/Esys_MAC.c +++ b/src/tss2-esys/api/Esys_MAC.c @@ -163,25 +163,25 @@ Esys_MAC_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(handleSession1, optionalSession2, optionalSession3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, handle, &handleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "handle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "handle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_MAC_Prepare(esysContext->sys, (handleNode == NULL) ? TPM2_RH_NULL : handleNode->rsrc.handle, buffer, inScheme); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, handleSession1, optionalSession2, optionalSession3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (handleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &handleNode->rsrc.name, &handleNode->auth); @@ -193,21 +193,21 @@ Esys_MAC_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, handleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -256,12 +256,12 @@ Esys_MAC_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (outMAC != NULL) { @@ -275,7 +275,7 @@ Esys_MAC_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -283,12 +283,12 @@ Esys_MAC_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -303,11 +303,11 @@ Esys_MAC_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -316,7 +316,7 @@ Esys_MAC_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -325,11 +325,11 @@ Esys_MAC_Finish( */ r = Tss2_Sys_MAC_Complete(esysContext->sys, (outMAC != NULL) ? *outMAC : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_MAC_Start.c b/src/tss2-esys/api/Esys_MAC_Start.c index 0f42c6ce4..1bbe7113f 100644 --- a/src/tss2-esys/api/Esys_MAC_Start.c +++ b/src/tss2-esys/api/Esys_MAC_Start.c @@ -176,28 +176,28 @@ Esys_MAC_Start_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(handleSession1, optionalSession2, optionalSession3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters(esysContext, auth); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, handle, &handleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "handle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "handle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_MAC_Start_Prepare(esysContext->sys, (handleNode == NULL) ? TPM2_RH_NULL : handleNode->rsrc.handle, auth, inScheme); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, handleSession1, optionalSession2, optionalSession3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (handleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &handleNode->rsrc.name, &handleNode->auth); @@ -209,21 +209,21 @@ Esys_MAC_Start_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, handleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -271,12 +271,12 @@ TSS2_RC Esys_MAC_Start_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; RSRC_NODE_T *sequenceHandleNode = NULL; /* Allocate memory for response parameters */ @@ -294,7 +294,7 @@ TSS2_RC Esys_MAC_Start_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -302,12 +302,12 @@ TSS2_RC Esys_MAC_Start_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -322,11 +322,11 @@ TSS2_RC Esys_MAC_Start_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -335,7 +335,7 @@ TSS2_RC Esys_MAC_Start_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -344,7 +344,7 @@ TSS2_RC Esys_MAC_Start_Finish( */ r = Tss2_Sys_MAC_Start_Complete(esysContext->sys, &sequenceHandleNode->rsrc.handle); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); @@ -355,7 +355,7 @@ TSS2_RC Esys_MAC_Start_Finish( /* Store the auth value parameter in the object meta data */ sequenceHandleNode->auth = esysContext->in.HMAC_Start.authData; - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_MakeCredential.c b/src/tss2-esys/api/Esys_MakeCredential.c index 513c8277c..45289b415 100644 --- a/src/tss2-esys/api/Esys_MakeCredential.c +++ b/src/tss2-esys/api/Esys_MakeCredential.c @@ -165,47 +165,47 @@ Esys_MakeCredential_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, handle, &handleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "handle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "handle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_MakeCredential_Prepare(esysContext->sys, (handleNode == NULL) ? TPM2_RH_NULL : handleNode->rsrc.handle, credential, objectName); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, handleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -258,12 +258,12 @@ Esys_MakeCredential_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (credentialBlob != NULL) { @@ -283,7 +283,7 @@ Esys_MakeCredential_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -291,12 +291,12 @@ Esys_MakeCredential_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -311,11 +311,11 @@ Esys_MakeCredential_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -324,7 +324,7 @@ Esys_MakeCredential_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -335,11 +335,11 @@ Esys_MakeCredential_Finish( (credentialBlob != NULL) ? *credentialBlob : NULL, (secret != NULL) ? *secret : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_NV_Certify.c b/src/tss2-esys/api/Esys_NV_Certify.c index b01a68599..bfae5c4ee 100644 --- a/src/tss2-esys/api/Esys_NV_Certify.c +++ b/src/tss2-esys/api/Esys_NV_Certify.c @@ -190,19 +190,19 @@ Esys_NV_Certify_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, signHandle, &signHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "signHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "signHandle unknown."); r = esys_GetResourceObject(esysContext, authHandle, &authHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authHandle unknown."); r = esys_GetResourceObject(esysContext, nvIndex, &nvIndexNode); - return_state_if_error(r, _ESYS_STATE_INIT, "nvIndex unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "nvIndex unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_NV_Certify_Prepare(esysContext->sys, @@ -213,11 +213,11 @@ Esys_NV_Certify_Async( (nvIndexNode == NULL) ? TPM2_RH_NULL : nvIndexNode->rsrc.handle, qualifyingData, inScheme, size, offset); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (signHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &signHandleNode->rsrc.name, &signHandleNode->auth); @@ -234,21 +234,21 @@ Esys_NV_Certify_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, signHandleNode, authHandleNode, nvIndexNode, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -301,12 +301,12 @@ Esys_NV_Certify_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (certifyInfo != NULL) { @@ -326,7 +326,7 @@ Esys_NV_Certify_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -334,12 +334,12 @@ Esys_NV_Certify_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -354,11 +354,11 @@ Esys_NV_Certify_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -367,7 +367,7 @@ Esys_NV_Certify_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -377,11 +377,11 @@ Esys_NV_Certify_Finish( r = Tss2_Sys_NV_Certify_Complete(esysContext->sys, (certifyInfo != NULL) ? *certifyInfo : NULL, (signature != NULL) ? *signature : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_NV_ChangeAuth.c b/src/tss2-esys/api/Esys_NV_ChangeAuth.c index 9321787b5..ef1333a91 100644 --- a/src/tss2-esys/api/Esys_NV_ChangeAuth.c +++ b/src/tss2-esys/api/Esys_NV_ChangeAuth.c @@ -173,36 +173,36 @@ Esys_NV_ChangeAuth_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters(esysContext, nvIndex, newAuth); authCopy = &esysContext->in.HierarchyChangeAuth.newAuth; /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, nvIndex, &nvIndexNode); - return_state_if_error(r, _ESYS_STATE_INIT, "nvIndex unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "nvIndex unknown."); if (!nvIndexNode) { LOG_ERROR("NV Object for Esys handle %x not found.", nvIndex); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_FAPI_RC_BAD_VALUE; } hashAlg = nvIndexNode->rsrc.misc.rsrc_nv_pub.nvPublic.nameAlg; r = iesys_adapt_auth_value(&esysContext->crypto_backend, authCopy, hashAlg); - return_state_if_error(r, _ESYS_STATE_INIT, "Adapt auth value"); + return_state_if_error(r, ESYS_STATE_INIT, "Adapt auth value"); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_NV_ChangeAuth_Prepare(esysContext->sys, nvIndexNode->rsrc.handle, newAuth); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], &nvIndexNode->rsrc.name, &nvIndexNode->auth); @@ -211,21 +211,21 @@ Esys_NV_ChangeAuth_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, nvIndexNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -274,18 +274,18 @@ Esys_NV_ChangeAuth_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -293,12 +293,12 @@ Esys_NV_ChangeAuth_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -313,11 +313,11 @@ Esys_NV_ChangeAuth_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } /* @@ -338,7 +338,7 @@ Esys_NV_ChangeAuth_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -346,10 +346,10 @@ Esys_NV_ChangeAuth_Finish( * to deliver the result. */ r = Tss2_Sys_NV_ChangeAuth_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_NV_DefineSpace.c b/src/tss2-esys/api/Esys_NV_DefineSpace.c index 18b00cdb0..bcbacd2ca 100644 --- a/src/tss2-esys/api/Esys_NV_DefineSpace.c +++ b/src/tss2-esys/api/Esys_NV_DefineSpace.c @@ -184,7 +184,7 @@ Esys_NV_DefineSpace_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Prevent creation of undeletable NV space */ if (publicInfo != NULL && @@ -192,13 +192,13 @@ Esys_NV_DefineSpace_Async( publicInfo->nvPublic.authPolicy.size == 0) { r = TSS2_ESYS_RC_BAD_VALUE; LOG_ERROR("Error (async) NV_DefineSpace: %" PRIx32, r); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters(esysContext, auth, publicInfo); @@ -206,12 +206,12 @@ Esys_NV_DefineSpace_Async( r = iesys_adapt_auth_value(&esysContext->crypto_backend, &esysContext->in.NV.authData, publicInfo->nvPublic.nameAlg); - return_state_if_error(r, _ESYS_STATE_INIT, "Adapt auth value."); + return_state_if_error(r, ESYS_STATE_INIT, "Adapt auth value."); } /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, authHandle, &authHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_NV_DefineSpace_Prepare(esysContext->sys, @@ -219,11 +219,11 @@ Esys_NV_DefineSpace_Async( : authHandleNode->rsrc.handle, &esysContext->in.NV.authData, publicInfo); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authHandleNode->rsrc.name, &authHandleNode->auth); @@ -235,21 +235,21 @@ Esys_NV_DefineSpace_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -296,12 +296,12 @@ Esys_NV_DefineSpace_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; RSRC_NODE_T *nvHandleNode = NULL; /* Allocate memory for response parameters */ @@ -318,7 +318,7 @@ Esys_NV_DefineSpace_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -326,12 +326,12 @@ Esys_NV_DefineSpace_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -346,11 +346,11 @@ Esys_NV_DefineSpace_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -359,7 +359,7 @@ Esys_NV_DefineSpace_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -367,7 +367,7 @@ Esys_NV_DefineSpace_Finish( * to deliver the result. */ r = Tss2_Sys_NV_DefineSpace_Complete(esysContext->sys); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); @@ -377,7 +377,7 @@ Esys_NV_DefineSpace_Finish( &nvHandleNode->rsrc.name); if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Error finish (ExecuteFinish) NV_DefineSpace: %" PRIx32, r); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } nvHandleNode->rsrc.handle = @@ -386,7 +386,7 @@ Esys_NV_DefineSpace_Finish( *esysContext->in.NV.publicInfo; nvHandleNode->auth = esysContext->in.NV.authData; - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_NV_Extend.c b/src/tss2-esys/api/Esys_NV_Extend.c index 637f2f6dc..81246ec26 100644 --- a/src/tss2-esys/api/Esys_NV_Extend.c +++ b/src/tss2-esys/api/Esys_NV_Extend.c @@ -173,18 +173,18 @@ Esys_NV_Extend_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters(esysContext, nvIndex); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, authHandle, &authHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authHandle unknown."); r = esys_GetResourceObject(esysContext, nvIndex, &nvIndexNode); - return_state_if_error(r, _ESYS_STATE_INIT, "nvIndex unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "nvIndex unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_NV_Extend_Prepare(esysContext->sys, @@ -192,11 +192,11 @@ Esys_NV_Extend_Async( : authHandleNode->rsrc.handle, (nvIndexNode == NULL) ? TPM2_RH_NULL : nvIndexNode->rsrc.handle, data); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authHandleNode->rsrc.name, &authHandleNode->auth); @@ -208,21 +208,21 @@ Esys_NV_Extend_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authHandleNode, nvIndexNode, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -268,18 +268,18 @@ Esys_NV_Extend_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -287,12 +287,12 @@ Esys_NV_Extend_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -307,11 +307,11 @@ Esys_NV_Extend_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -320,7 +320,7 @@ Esys_NV_Extend_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -328,7 +328,7 @@ Esys_NV_Extend_Finish( * to deliver the result. */ r = Tss2_Sys_NV_Extend_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); ESYS_TR nvIndex = esysContext->in.NV.nvIndex; @@ -344,7 +344,7 @@ Esys_NV_Extend_Finish( return_if_error(r, "Error get nvname") } - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_NV_GlobalWriteLock.c b/src/tss2-esys/api/Esys_NV_GlobalWriteLock.c index f16d6c153..2b799fe10 100644 --- a/src/tss2-esys/api/Esys_NV_GlobalWriteLock.c +++ b/src/tss2-esys/api/Esys_NV_GlobalWriteLock.c @@ -159,26 +159,26 @@ Esys_NV_GlobalWriteLock_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, authHandle, &authHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_NV_GlobalWriteLock_Prepare(esysContext->sys, (authHandleNode == NULL) ? TPM2_RH_NULL : authHandleNode->rsrc.handle); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authHandleNode->rsrc.name, &authHandleNode->auth); @@ -190,21 +190,21 @@ Esys_NV_GlobalWriteLock_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -250,18 +250,18 @@ Esys_NV_GlobalWriteLock_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -269,12 +269,12 @@ Esys_NV_GlobalWriteLock_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -289,11 +289,11 @@ Esys_NV_GlobalWriteLock_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -302,7 +302,7 @@ Esys_NV_GlobalWriteLock_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -310,10 +310,10 @@ Esys_NV_GlobalWriteLock_Finish( * to deliver the result. */ r = Tss2_Sys_NV_GlobalWriteLock_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_NV_Increment.c b/src/tss2-esys/api/Esys_NV_Increment.c index 6ae363164..677b08c91 100644 --- a/src/tss2-esys/api/Esys_NV_Increment.c +++ b/src/tss2-esys/api/Esys_NV_Increment.c @@ -174,18 +174,18 @@ Esys_NV_Increment_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters(esysContext, nvIndex); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, authHandle, &authHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authHandle unknown."); r = esys_GetResourceObject(esysContext, nvIndex, &nvIndexNode); - return_state_if_error(r, _ESYS_STATE_INIT, "nvIndex unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "nvIndex unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_NV_Increment_Prepare(esysContext->sys, @@ -193,11 +193,11 @@ Esys_NV_Increment_Async( : authHandleNode->rsrc.handle, (nvIndexNode == NULL) ? TPM2_RH_NULL : nvIndexNode->rsrc.handle); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authHandleNode->rsrc.name, &authHandleNode->auth); @@ -209,21 +209,21 @@ Esys_NV_Increment_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authHandleNode, nvIndexNode, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -269,18 +269,18 @@ Esys_NV_Increment_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -288,12 +288,12 @@ Esys_NV_Increment_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -308,11 +308,11 @@ Esys_NV_Increment_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -321,7 +321,7 @@ Esys_NV_Increment_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -329,7 +329,7 @@ Esys_NV_Increment_Finish( * to deliver the result. */ r = Tss2_Sys_NV_Increment_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); @@ -345,7 +345,7 @@ Esys_NV_Increment_Finish( &nvIndexNode->rsrc.name); return_if_error(r, "Error get nvname") } - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_NV_Read.c b/src/tss2-esys/api/Esys_NV_Read.c index 4ec609e72..be80b8799 100644 --- a/src/tss2-esys/api/Esys_NV_Read.c +++ b/src/tss2-esys/api/Esys_NV_Read.c @@ -172,17 +172,17 @@ Esys_NV_Read_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, authHandle, &authHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authHandle unknown."); r = esys_GetResourceObject(esysContext, nvIndex, &nvIndexNode); - return_state_if_error(r, _ESYS_STATE_INIT, "nvIndex unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "nvIndex unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_NV_Read_Prepare(esysContext->sys, @@ -190,11 +190,11 @@ Esys_NV_Read_Async( : authHandleNode->rsrc.handle, (nvIndexNode == NULL) ? TPM2_RH_NULL : nvIndexNode->rsrc.handle, size, offset); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authHandleNode->rsrc.name, &authHandleNode->auth); @@ -206,21 +206,21 @@ Esys_NV_Read_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authHandleNode, nvIndexNode, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -269,12 +269,12 @@ Esys_NV_Read_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (data != NULL) { @@ -288,7 +288,7 @@ Esys_NV_Read_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -296,12 +296,12 @@ Esys_NV_Read_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -316,11 +316,11 @@ Esys_NV_Read_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -329,7 +329,7 @@ Esys_NV_Read_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -338,11 +338,11 @@ Esys_NV_Read_Finish( */ r = Tss2_Sys_NV_Read_Complete(esysContext->sys, (data != NULL) ? *data : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_NV_ReadLock.c b/src/tss2-esys/api/Esys_NV_ReadLock.c index 013f7a1ce..425bcb4a3 100644 --- a/src/tss2-esys/api/Esys_NV_ReadLock.c +++ b/src/tss2-esys/api/Esys_NV_ReadLock.c @@ -174,18 +174,18 @@ Esys_NV_ReadLock_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters(esysContext, nvIndex); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, authHandle, &authHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authHandle unknown."); r = esys_GetResourceObject(esysContext, nvIndex, &nvIndexNode); - return_state_if_error(r, _ESYS_STATE_INIT, "nvIndex unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "nvIndex unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_NV_ReadLock_Prepare(esysContext->sys, @@ -193,11 +193,11 @@ Esys_NV_ReadLock_Async( : authHandleNode->rsrc.handle, (nvIndexNode == NULL) ? TPM2_RH_NULL : nvIndexNode->rsrc.handle); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authHandleNode->rsrc.name, &authHandleNode->auth); @@ -209,21 +209,21 @@ Esys_NV_ReadLock_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authHandleNode, nvIndexNode, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -269,18 +269,18 @@ Esys_NV_ReadLock_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -288,12 +288,12 @@ Esys_NV_ReadLock_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -308,11 +308,11 @@ Esys_NV_ReadLock_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -321,7 +321,7 @@ Esys_NV_ReadLock_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -329,7 +329,7 @@ Esys_NV_ReadLock_Finish( * to deliver the result. */ r = Tss2_Sys_NV_ReadLock_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); @@ -345,7 +345,7 @@ Esys_NV_ReadLock_Finish( &nvIndexNode->rsrc.name); return_if_error(r, "Error get nvname") } - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_NV_ReadPublic.c b/src/tss2-esys/api/Esys_NV_ReadPublic.c index f30f2c5fe..da7d5e21d 100644 --- a/src/tss2-esys/api/Esys_NV_ReadPublic.c +++ b/src/tss2-esys/api/Esys_NV_ReadPublic.c @@ -167,47 +167,47 @@ Esys_NV_ReadPublic_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters(esysContext, nvIndex); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, nvIndex, &nvIndexNode); - return_state_if_error(r, _ESYS_STATE_INIT, "nvIndex unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "nvIndex unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_NV_ReadPublic_Prepare(esysContext->sys, (nvIndexNode == NULL) ? TPM2_RH_NULL : nvIndexNode->rsrc.handle); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, nvIndexNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -261,12 +261,12 @@ Esys_NV_ReadPublic_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ lnvPublic = calloc(1, sizeof(TPM2B_NV_PUBLIC)); @@ -282,7 +282,7 @@ Esys_NV_ReadPublic_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -290,12 +290,12 @@ Esys_NV_ReadPublic_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -310,11 +310,11 @@ Esys_NV_ReadPublic_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -323,7 +323,7 @@ Esys_NV_ReadPublic_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -331,7 +331,7 @@ Esys_NV_ReadPublic_Finish( * to deliver the result. */ r = Tss2_Sys_NV_ReadPublic_Complete(esysContext->sys, lnvPublic, lnvName); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); @@ -357,7 +357,7 @@ Esys_NV_ReadPublic_Finish( else SAFE_FREE(lnvName); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_NV_SetBits.c b/src/tss2-esys/api/Esys_NV_SetBits.c index b6fa34a9d..040e354af 100644 --- a/src/tss2-esys/api/Esys_NV_SetBits.c +++ b/src/tss2-esys/api/Esys_NV_SetBits.c @@ -179,18 +179,18 @@ Esys_NV_SetBits_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters(esysContext, nvIndex); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, authHandle, &authHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authHandle unknown."); r = esys_GetResourceObject(esysContext, nvIndex, &nvIndexNode); - return_state_if_error(r, _ESYS_STATE_INIT, "nvIndex unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "nvIndex unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_NV_SetBits_Prepare(esysContext->sys, @@ -198,11 +198,11 @@ Esys_NV_SetBits_Async( : authHandleNode->rsrc.handle, (nvIndexNode == NULL) ? TPM2_RH_NULL : nvIndexNode->rsrc.handle, bits); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authHandleNode->rsrc.name, &authHandleNode->auth); @@ -214,21 +214,21 @@ Esys_NV_SetBits_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authHandleNode, nvIndexNode, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -274,18 +274,18 @@ Esys_NV_SetBits_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -293,12 +293,12 @@ Esys_NV_SetBits_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -313,11 +313,11 @@ Esys_NV_SetBits_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -326,7 +326,7 @@ Esys_NV_SetBits_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -334,7 +334,7 @@ Esys_NV_SetBits_Finish( * to deliver the result. */ r = Tss2_Sys_NV_SetBits_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); @@ -350,7 +350,7 @@ Esys_NV_SetBits_Finish( &nvIndexNode->rsrc.name); return_if_error(r, "Error get nvname") } - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_NV_UndefineSpace.c b/src/tss2-esys/api/Esys_NV_UndefineSpace.c index fc06999fe..f5ded61a2 100644 --- a/src/tss2-esys/api/Esys_NV_UndefineSpace.c +++ b/src/tss2-esys/api/Esys_NV_UndefineSpace.c @@ -172,18 +172,18 @@ Esys_NV_UndefineSpace_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters(esysContext, nvIndex); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, authHandle, &authHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authHandle unknown."); r = esys_GetResourceObject(esysContext, nvIndex, &nvIndexNode); - return_state_if_error(r, _ESYS_STATE_INIT, "nvIndex unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "nvIndex unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_NV_UndefineSpace_Prepare(esysContext->sys, @@ -191,11 +191,11 @@ Esys_NV_UndefineSpace_Async( : authHandleNode->rsrc.handle, (nvIndexNode == NULL) ? TPM2_RH_NULL : nvIndexNode->rsrc.handle); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authHandleNode->rsrc.name, &authHandleNode->auth); @@ -207,21 +207,21 @@ Esys_NV_UndefineSpace_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authHandleNode, nvIndexNode, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -267,18 +267,18 @@ Esys_NV_UndefineSpace_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -286,12 +286,12 @@ Esys_NV_UndefineSpace_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -306,11 +306,11 @@ Esys_NV_UndefineSpace_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -319,7 +319,7 @@ Esys_NV_UndefineSpace_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -327,14 +327,14 @@ Esys_NV_UndefineSpace_Finish( * to deliver the result. */ r = Tss2_Sys_NV_UndefineSpace_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); /* The ESYS_TR object (nvIndex) has to be invalidated */ r = Esys_TR_Close(esysContext, &esysContext->in.NV.nvIndex); return_if_error(r, "invalidate object"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_NV_UndefineSpaceSpecial.c b/src/tss2-esys/api/Esys_NV_UndefineSpaceSpecial.c index dda4b6fd2..53ea804d7 100644 --- a/src/tss2-esys/api/Esys_NV_UndefineSpaceSpecial.c +++ b/src/tss2-esys/api/Esys_NV_UndefineSpaceSpecial.c @@ -172,18 +172,18 @@ Esys_NV_UndefineSpaceSpecial_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters(esysContext, nvIndex); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, nvIndex, &nvIndexNode); - return_state_if_error(r, _ESYS_STATE_INIT, "nvIndex unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "nvIndex unknown."); r = esys_GetResourceObject(esysContext, platform, &platformNode); - return_state_if_error(r, _ESYS_STATE_INIT, "platform unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "platform unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_NV_UndefineSpaceSpecial_Prepare(esysContext->sys, @@ -193,11 +193,11 @@ Esys_NV_UndefineSpaceSpecial_Async( (platformNode == NULL) ? TPM2_RH_NULL : platformNode->rsrc.handle); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (nvIndexNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &nvIndexNode->rsrc.name, &nvIndexNode->auth); @@ -214,21 +214,21 @@ Esys_NV_UndefineSpaceSpecial_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, nvIndexNode, platformNode, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -277,18 +277,18 @@ Esys_NV_UndefineSpaceSpecial_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -296,12 +296,12 @@ Esys_NV_UndefineSpaceSpecial_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -316,11 +316,11 @@ Esys_NV_UndefineSpaceSpecial_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } /* @@ -346,7 +346,7 @@ Esys_NV_UndefineSpaceSpecial_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -354,10 +354,10 @@ Esys_NV_UndefineSpaceSpecial_Finish( * to deliver the result. */ r = Tss2_Sys_NV_UndefineSpaceSpecial_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_NV_Write.c b/src/tss2-esys/api/Esys_NV_Write.c index da6caf1a1..ac0f5fa56 100644 --- a/src/tss2-esys/api/Esys_NV_Write.c +++ b/src/tss2-esys/api/Esys_NV_Write.c @@ -177,18 +177,18 @@ Esys_NV_Write_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters(esysContext, nvIndex); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, authHandle, &authHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authHandle unknown."); r = esys_GetResourceObject(esysContext, nvIndex, &nvIndexNode); - return_state_if_error(r, _ESYS_STATE_INIT, "nvIndex unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "nvIndex unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_NV_Write_Prepare(esysContext->sys, @@ -196,11 +196,11 @@ Esys_NV_Write_Async( : authHandleNode->rsrc.handle, (nvIndexNode == NULL) ? TPM2_RH_NULL : nvIndexNode->rsrc.handle, data, offset); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authHandleNode->rsrc.name, &authHandleNode->auth); @@ -212,21 +212,21 @@ Esys_NV_Write_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authHandleNode, nvIndexNode, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -272,18 +272,18 @@ Esys_NV_Write_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -291,12 +291,12 @@ Esys_NV_Write_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -311,11 +311,11 @@ Esys_NV_Write_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -324,7 +324,7 @@ Esys_NV_Write_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -332,7 +332,7 @@ Esys_NV_Write_Finish( * to deliver the result. */ r = Tss2_Sys_NV_Write_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); @@ -348,7 +348,7 @@ Esys_NV_Write_Finish( &nvIndexNode->rsrc.name); return_if_error(r, "Error get nvname") } - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_NV_WriteLock.c b/src/tss2-esys/api/Esys_NV_WriteLock.c index 924d53718..d1e92f33a 100644 --- a/src/tss2-esys/api/Esys_NV_WriteLock.c +++ b/src/tss2-esys/api/Esys_NV_WriteLock.c @@ -174,18 +174,18 @@ Esys_NV_WriteLock_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters(esysContext, nvIndex); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, authHandle, &authHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authHandle unknown."); r = esys_GetResourceObject(esysContext, nvIndex, &nvIndexNode); - return_state_if_error(r, _ESYS_STATE_INIT, "nvIndex unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "nvIndex unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_NV_WriteLock_Prepare(esysContext->sys, @@ -193,11 +193,11 @@ Esys_NV_WriteLock_Async( : authHandleNode->rsrc.handle, (nvIndexNode == NULL) ? TPM2_RH_NULL : nvIndexNode->rsrc.handle); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authHandleNode->rsrc.name, &authHandleNode->auth); @@ -209,21 +209,21 @@ Esys_NV_WriteLock_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authHandleNode, nvIndexNode, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -269,18 +269,18 @@ Esys_NV_WriteLock_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -288,12 +288,12 @@ Esys_NV_WriteLock_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -308,11 +308,11 @@ Esys_NV_WriteLock_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -321,7 +321,7 @@ Esys_NV_WriteLock_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -329,7 +329,7 @@ Esys_NV_WriteLock_Finish( * to deliver the result. */ r = Tss2_Sys_NV_WriteLock_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); @@ -345,7 +345,7 @@ Esys_NV_WriteLock_Finish( &nvIndexNode->rsrc.name); return_if_error(r, "Error get nvname") } - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_ObjectChangeAuth.c b/src/tss2-esys/api/Esys_ObjectChangeAuth.c index 8e06cbaa9..5ac0d8f6f 100644 --- a/src/tss2-esys/api/Esys_ObjectChangeAuth.c +++ b/src/tss2-esys/api/Esys_ObjectChangeAuth.c @@ -165,24 +165,24 @@ Esys_ObjectChangeAuth_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, objectHandle, &objectHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "objectHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "objectHandle unknown."); if (!objectHandleNode) { LOG_ERROR("Object for Esys handle %x not found.", objectHandle); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_FAPI_RC_BAD_VALUE; } r = esys_GetResourceObject(esysContext, parentHandle, &parentHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "parentHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "parentHandle unknown."); if (objectHandleNode->rsrc.rsrcType == IESYSC_KEY_RSRC) { hashAlg = objectHandleNode->rsrc.misc.rsrc_key_pub.publicArea.nameAlg; @@ -193,7 +193,7 @@ Esys_ObjectChangeAuth_Async( }; r = iesys_adapt_auth_value(&esysContext->crypto_backend, &authCopy, hashAlg); - return_state_if_error(r, _ESYS_STATE_INIT, "Adapt auth value"); + return_state_if_error(r, ESYS_STATE_INIT, "Adapt auth value"); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_ObjectChangeAuth_Prepare(esysContext->sys, @@ -202,11 +202,11 @@ Esys_ObjectChangeAuth_Async( ? TPM2_RH_NULL : parentHandleNode->rsrc.handle, &authCopy); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], &objectHandleNode->rsrc.name, &objectHandleNode->auth); @@ -215,21 +215,21 @@ Esys_ObjectChangeAuth_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, objectHandleNode, parentHandleNode, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -278,12 +278,12 @@ Esys_ObjectChangeAuth_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (outPrivate != NULL) { @@ -297,7 +297,7 @@ Esys_ObjectChangeAuth_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -305,12 +305,12 @@ Esys_ObjectChangeAuth_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -325,11 +325,11 @@ Esys_ObjectChangeAuth_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -338,7 +338,7 @@ Esys_ObjectChangeAuth_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -348,11 +348,11 @@ Esys_ObjectChangeAuth_Finish( r = Tss2_Sys_ObjectChangeAuth_Complete(esysContext->sys, (outPrivate != NULL) ? *outPrivate : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_PCR_Allocate.c b/src/tss2-esys/api/Esys_PCR_Allocate.c index 3879b4cb7..07730cd0a 100644 --- a/src/tss2-esys/api/Esys_PCR_Allocate.c +++ b/src/tss2-esys/api/Esys_PCR_Allocate.c @@ -173,26 +173,26 @@ Esys_PCR_Allocate_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, authHandle, &authHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PCR_Allocate_Prepare(esysContext->sys, (authHandleNode == NULL) ? TPM2_RH_NULL : authHandleNode->rsrc.handle, pcrAllocation); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authHandleNode->rsrc.name, &authHandleNode->auth); @@ -204,21 +204,21 @@ Esys_PCR_Allocate_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -275,18 +275,18 @@ Esys_PCR_Allocate_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -294,12 +294,12 @@ Esys_PCR_Allocate_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -314,11 +314,11 @@ Esys_PCR_Allocate_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -327,7 +327,7 @@ Esys_PCR_Allocate_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -336,10 +336,10 @@ Esys_PCR_Allocate_Finish( */ r = Tss2_Sys_PCR_Allocate_Complete(esysContext->sys, allocationSuccess, maxPCR, sizeNeeded, sizeAvailable); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_PCR_Event.c b/src/tss2-esys/api/Esys_PCR_Event.c index 10eeb6522..086d42f55 100644 --- a/src/tss2-esys/api/Esys_PCR_Event.c +++ b/src/tss2-esys/api/Esys_PCR_Event.c @@ -160,25 +160,25 @@ Esys_PCR_Event_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, pcrHandle, &pcrHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "pcrHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "pcrHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PCR_Event_Prepare(esysContext->sys, (pcrHandleNode == NULL) ? TPM2_RH_NULL : pcrHandleNode->rsrc.handle, eventData); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (pcrHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &pcrHandleNode->rsrc.name, &pcrHandleNode->auth); @@ -190,21 +190,21 @@ Esys_PCR_Event_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, pcrHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -253,12 +253,12 @@ Esys_PCR_Event_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (digests != NULL) { @@ -272,7 +272,7 @@ Esys_PCR_Event_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -280,12 +280,12 @@ Esys_PCR_Event_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -300,11 +300,11 @@ Esys_PCR_Event_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -313,7 +313,7 @@ Esys_PCR_Event_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -322,11 +322,11 @@ Esys_PCR_Event_Finish( */ r = Tss2_Sys_PCR_Event_Complete(esysContext->sys, (digests != NULL) ? *digests : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_PCR_Extend.c b/src/tss2-esys/api/Esys_PCR_Extend.c index b9381a430..e03dcdbdb 100644 --- a/src/tss2-esys/api/Esys_PCR_Extend.c +++ b/src/tss2-esys/api/Esys_PCR_Extend.c @@ -163,25 +163,25 @@ Esys_PCR_Extend_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, pcrHandle, &pcrHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "pcrHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "pcrHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PCR_Extend_Prepare(esysContext->sys, (pcrHandleNode == NULL) ? TPM2_RH_NULL : pcrHandleNode->rsrc.handle, digests); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (pcrHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &pcrHandleNode->rsrc.name, &pcrHandleNode->auth); @@ -193,21 +193,21 @@ Esys_PCR_Extend_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, pcrHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -253,18 +253,18 @@ Esys_PCR_Extend_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -272,12 +272,12 @@ Esys_PCR_Extend_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -292,11 +292,11 @@ Esys_PCR_Extend_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -305,7 +305,7 @@ Esys_PCR_Extend_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -313,10 +313,10 @@ Esys_PCR_Extend_Finish( * to deliver the result. */ r = Tss2_Sys_PCR_Extend_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_PCR_Read.c b/src/tss2-esys/api/Esys_PCR_Read.c index e20ac6e2f..6920245a5 100644 --- a/src/tss2-esys/api/Esys_PCR_Read.c +++ b/src/tss2-esys/api/Esys_PCR_Read.c @@ -161,40 +161,40 @@ Esys_PCR_Read_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PCR_Read_Prepare(esysContext->sys, pcrSelectionIn); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, NULL, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -251,12 +251,12 @@ Esys_PCR_Read_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (pcrSelectionOut != NULL) { @@ -276,7 +276,7 @@ Esys_PCR_Read_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -284,12 +284,12 @@ Esys_PCR_Read_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -304,11 +304,11 @@ Esys_PCR_Read_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -317,7 +317,7 @@ Esys_PCR_Read_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -328,11 +328,11 @@ Esys_PCR_Read_Finish( (pcrSelectionOut != NULL) ? *pcrSelectionOut : NULL, (pcrValues != NULL) ? *pcrValues : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_PCR_Reset.c b/src/tss2-esys/api/Esys_PCR_Reset.c index e4d8f2e9e..f27362ffd 100644 --- a/src/tss2-esys/api/Esys_PCR_Reset.c +++ b/src/tss2-esys/api/Esys_PCR_Reset.c @@ -159,25 +159,25 @@ Esys_PCR_Reset_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, pcrHandle, &pcrHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "pcrHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "pcrHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PCR_Reset_Prepare(esysContext->sys, (pcrHandleNode == NULL) ? TPM2_RH_NULL : pcrHandleNode->rsrc.handle); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (pcrHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &pcrHandleNode->rsrc.name, &pcrHandleNode->auth); @@ -189,21 +189,21 @@ Esys_PCR_Reset_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, pcrHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -249,18 +249,18 @@ Esys_PCR_Reset_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -268,12 +268,12 @@ Esys_PCR_Reset_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -288,11 +288,11 @@ Esys_PCR_Reset_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -301,7 +301,7 @@ Esys_PCR_Reset_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -309,10 +309,10 @@ Esys_PCR_Reset_Finish( * to deliver the result. */ r = Tss2_Sys_PCR_Reset_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_PCR_SetAuthPolicy.c b/src/tss2-esys/api/Esys_PCR_SetAuthPolicy.c index e0b6c9cf6..7c8a82fe7 100644 --- a/src/tss2-esys/api/Esys_PCR_SetAuthPolicy.c +++ b/src/tss2-esys/api/Esys_PCR_SetAuthPolicy.c @@ -166,15 +166,15 @@ Esys_PCR_SetAuthPolicy_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, authHandle, &authHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PCR_SetAuthPolicy_Prepare(esysContext->sys, @@ -182,11 +182,11 @@ Esys_PCR_SetAuthPolicy_Async( ? TPM2_RH_NULL : authHandleNode->rsrc.handle, authPolicy, hashAlg, pcrNum); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authHandleNode->rsrc.name, &authHandleNode->auth); @@ -198,21 +198,21 @@ Esys_PCR_SetAuthPolicy_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -258,18 +258,18 @@ Esys_PCR_SetAuthPolicy_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -277,12 +277,12 @@ Esys_PCR_SetAuthPolicy_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -297,11 +297,11 @@ Esys_PCR_SetAuthPolicy_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -310,7 +310,7 @@ Esys_PCR_SetAuthPolicy_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -318,10 +318,10 @@ Esys_PCR_SetAuthPolicy_Finish( * to deliver the result. */ r = Tss2_Sys_PCR_SetAuthPolicy_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_PCR_SetAuthValue.c b/src/tss2-esys/api/Esys_PCR_SetAuthValue.c index 09d53f7b5..264c1f0fd 100644 --- a/src/tss2-esys/api/Esys_PCR_SetAuthValue.c +++ b/src/tss2-esys/api/Esys_PCR_SetAuthValue.c @@ -174,27 +174,27 @@ Esys_PCR_SetAuthValue_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters(esysContext, pcrHandle, auth); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, pcrHandle, &pcrHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "pcrHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "pcrHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PCR_SetAuthValue_Prepare(esysContext->sys, (pcrHandleNode == NULL) ? TPM2_RH_NULL : pcrHandleNode->rsrc.handle, auth); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (pcrHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &pcrHandleNode->rsrc.name, &pcrHandleNode->auth); @@ -206,21 +206,21 @@ Esys_PCR_SetAuthValue_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, pcrHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -269,18 +269,18 @@ Esys_PCR_SetAuthValue_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -288,12 +288,12 @@ Esys_PCR_SetAuthValue_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -308,11 +308,11 @@ Esys_PCR_SetAuthValue_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -334,7 +334,7 @@ Esys_PCR_SetAuthValue_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -342,10 +342,10 @@ Esys_PCR_SetAuthValue_Finish( * to deliver the result. */ r = Tss2_Sys_PCR_SetAuthValue_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_PP_Commands.c b/src/tss2-esys/api/Esys_PP_Commands.c index b218020b4..970668ee3 100644 --- a/src/tss2-esys/api/Esys_PP_Commands.c +++ b/src/tss2-esys/api/Esys_PP_Commands.c @@ -172,26 +172,26 @@ Esys_PP_Commands_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, auth, &authNode); - return_state_if_error(r, _ESYS_STATE_INIT, "auth unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "auth unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PP_Commands_Prepare(esysContext->sys, (authNode == NULL) ? TPM2_RH_NULL : authNode->rsrc.handle, setList, clearList); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authNode->rsrc.name, &authNode->auth); @@ -203,21 +203,21 @@ Esys_PP_Commands_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -263,18 +263,18 @@ Esys_PP_Commands_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -282,12 +282,12 @@ Esys_PP_Commands_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -302,11 +302,11 @@ Esys_PP_Commands_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -315,7 +315,7 @@ Esys_PP_Commands_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -323,10 +323,10 @@ Esys_PP_Commands_Finish( * to deliver the result. */ r = Tss2_Sys_PP_Commands_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_PolicyAuthValue.c b/src/tss2-esys/api/Esys_PolicyAuthValue.c index 53d533663..85881aa5b 100644 --- a/src/tss2-esys/api/Esys_PolicyAuthValue.c +++ b/src/tss2-esys/api/Esys_PolicyAuthValue.c @@ -167,48 +167,48 @@ Esys_PolicyAuthValue_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters(esysContext, policySession); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, policySession, &policySessionNode); - return_state_if_error(r, _ESYS_STATE_INIT, "policySession unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "policySession unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PolicyAuthValue_Prepare(esysContext->sys, (policySessionNode == NULL) ? TPM2_RH_NULL : policySessionNode->rsrc.handle); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, policySessionNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -254,18 +254,18 @@ Esys_PolicyAuthValue_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -273,12 +273,12 @@ Esys_PolicyAuthValue_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -293,11 +293,11 @@ Esys_PolicyAuthValue_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -306,7 +306,7 @@ Esys_PolicyAuthValue_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -314,7 +314,7 @@ Esys_PolicyAuthValue_Finish( * to deliver the result. */ r = Tss2_Sys_PolicyAuthValue_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); ESYS_TR policySession = esysContext->in.Policy.policySession; @@ -325,7 +325,7 @@ Esys_PolicyAuthValue_Finish( if (policySessionNode != NULL) /* Indicate that the auth value has to be included in the hmac */ policySessionNode->rsrc.misc.rsrc_session.type_policy_session = POLICY_AUTH; - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_PolicyAuthorize.c b/src/tss2-esys/api/Esys_PolicyAuthorize.c index e85e57898..dd44f3bb8 100644 --- a/src/tss2-esys/api/Esys_PolicyAuthorize.c +++ b/src/tss2-esys/api/Esys_PolicyAuthorize.c @@ -180,15 +180,15 @@ Esys_PolicyAuthorize_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, policySession, &policySessionNode); - return_state_if_error(r, _ESYS_STATE_INIT, "policySession unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "policySession unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PolicyAuthorize_Prepare(esysContext->sys, @@ -197,32 +197,32 @@ Esys_PolicyAuthorize_Async( : policySessionNode->rsrc.handle, approvedPolicy, policyRef, keySign, checkTicket); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, policySessionNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -268,18 +268,18 @@ Esys_PolicyAuthorize_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -287,12 +287,12 @@ Esys_PolicyAuthorize_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -307,11 +307,11 @@ Esys_PolicyAuthorize_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -320,7 +320,7 @@ Esys_PolicyAuthorize_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -328,10 +328,10 @@ Esys_PolicyAuthorize_Finish( * to deliver the result. */ r = Tss2_Sys_PolicyAuthorize_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_PolicyAuthorizeNV.c b/src/tss2-esys/api/Esys_PolicyAuthorizeNV.c index cb6290eaf..afd582031 100644 --- a/src/tss2-esys/api/Esys_PolicyAuthorizeNV.c +++ b/src/tss2-esys/api/Esys_PolicyAuthorizeNV.c @@ -173,19 +173,19 @@ Esys_PolicyAuthorizeNV_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, authHandle, &authHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authHandle unknown."); r = esys_GetResourceObject(esysContext, nvIndex, &nvIndexNode); - return_state_if_error(r, _ESYS_STATE_INIT, "nvIndex unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "nvIndex unknown."); r = esys_GetResourceObject(esysContext, policySession, &policySessionNode); - return_state_if_error(r, _ESYS_STATE_INIT, "policySession unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "policySession unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PolicyAuthorizeNV_Prepare(esysContext->sys, @@ -197,11 +197,11 @@ Esys_PolicyAuthorizeNV_Async( (policySessionNode == NULL) ? TPM2_RH_NULL : policySessionNode->rsrc.handle); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authHandleNode->rsrc.name, &authHandleNode->auth); @@ -213,21 +213,21 @@ Esys_PolicyAuthorizeNV_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authHandleNode, nvIndexNode, policySessionNode, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -273,18 +273,18 @@ Esys_PolicyAuthorizeNV_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -292,12 +292,12 @@ Esys_PolicyAuthorizeNV_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -312,11 +312,11 @@ Esys_PolicyAuthorizeNV_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -325,7 +325,7 @@ Esys_PolicyAuthorizeNV_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -333,10 +333,10 @@ Esys_PolicyAuthorizeNV_Finish( * to deliver the result. */ r = Tss2_Sys_PolicyAuthorizeNV_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_PolicyCommandCode.c b/src/tss2-esys/api/Esys_PolicyCommandCode.c index 914c50d83..7604cb6ff 100644 --- a/src/tss2-esys/api/Esys_PolicyCommandCode.c +++ b/src/tss2-esys/api/Esys_PolicyCommandCode.c @@ -163,15 +163,15 @@ Esys_PolicyCommandCode_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, policySession, &policySessionNode); - return_state_if_error(r, _ESYS_STATE_INIT, "policySession unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "policySession unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PolicyCommandCode_Prepare(esysContext->sys, @@ -179,32 +179,32 @@ Esys_PolicyCommandCode_Async( ? TPM2_RH_NULL : policySessionNode->rsrc.handle, code); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, policySessionNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -250,18 +250,18 @@ Esys_PolicyCommandCode_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -269,12 +269,12 @@ Esys_PolicyCommandCode_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -289,11 +289,11 @@ Esys_PolicyCommandCode_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -302,7 +302,7 @@ Esys_PolicyCommandCode_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -310,10 +310,10 @@ Esys_PolicyCommandCode_Finish( * to deliver the result. */ r = Tss2_Sys_PolicyCommandCode_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_PolicyCounterTimer.c b/src/tss2-esys/api/Esys_PolicyCounterTimer.c index 5a87b2261..23d13dda0 100644 --- a/src/tss2-esys/api/Esys_PolicyCounterTimer.c +++ b/src/tss2-esys/api/Esys_PolicyCounterTimer.c @@ -169,15 +169,15 @@ Esys_PolicyCounterTimer_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, policySession, &policySessionNode); - return_state_if_error(r, _ESYS_STATE_INIT, "policySession unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "policySession unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PolicyCounterTimer_Prepare(esysContext->sys, @@ -185,32 +185,32 @@ Esys_PolicyCounterTimer_Async( ? TPM2_RH_NULL : policySessionNode->rsrc.handle, operandB, offset, operation); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, policySessionNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -256,18 +256,18 @@ Esys_PolicyCounterTimer_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -275,12 +275,12 @@ Esys_PolicyCounterTimer_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -295,11 +295,11 @@ Esys_PolicyCounterTimer_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -308,7 +308,7 @@ Esys_PolicyCounterTimer_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -316,10 +316,10 @@ Esys_PolicyCounterTimer_Finish( * to deliver the result. */ r = Tss2_Sys_PolicyCounterTimer_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_PolicyCpHash.c b/src/tss2-esys/api/Esys_PolicyCpHash.c index bb0f5bcc8..004ed6871 100644 --- a/src/tss2-esys/api/Esys_PolicyCpHash.c +++ b/src/tss2-esys/api/Esys_PolicyCpHash.c @@ -163,47 +163,47 @@ Esys_PolicyCpHash_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, policySession, &policySessionNode); - return_state_if_error(r, _ESYS_STATE_INIT, "policySession unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "policySession unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PolicyCpHash_Prepare(esysContext->sys, (policySessionNode == NULL) ? TPM2_RH_NULL : policySessionNode->rsrc.handle, cpHashA); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, policySessionNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -249,18 +249,18 @@ Esys_PolicyCpHash_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -268,12 +268,12 @@ Esys_PolicyCpHash_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -288,11 +288,11 @@ Esys_PolicyCpHash_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -301,7 +301,7 @@ Esys_PolicyCpHash_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -309,10 +309,10 @@ Esys_PolicyCpHash_Finish( * to deliver the result. */ r = Tss2_Sys_PolicyCpHash_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_PolicyDuplicationSelect.c b/src/tss2-esys/api/Esys_PolicyDuplicationSelect.c index 62b53ee53..5092e4c02 100644 --- a/src/tss2-esys/api/Esys_PolicyDuplicationSelect.c +++ b/src/tss2-esys/api/Esys_PolicyDuplicationSelect.c @@ -175,15 +175,15 @@ Esys_PolicyDuplicationSelect_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, policySession, &policySessionNode); - return_state_if_error(r, _ESYS_STATE_INIT, "policySession unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "policySession unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PolicyDuplicationSelect_Prepare(esysContext->sys, @@ -192,32 +192,32 @@ Esys_PolicyDuplicationSelect_Async( : policySessionNode->rsrc.handle, objectName, newParentName, includeObject); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, policySessionNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -263,18 +263,18 @@ Esys_PolicyDuplicationSelect_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -282,12 +282,12 @@ Esys_PolicyDuplicationSelect_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -302,11 +302,11 @@ Esys_PolicyDuplicationSelect_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -315,7 +315,7 @@ Esys_PolicyDuplicationSelect_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -323,10 +323,10 @@ Esys_PolicyDuplicationSelect_Finish( * to deliver the result. */ r = Tss2_Sys_PolicyDuplicationSelect_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_PolicyGetDigest.c b/src/tss2-esys/api/Esys_PolicyGetDigest.c index b88a13603..5d1f74f94 100644 --- a/src/tss2-esys/api/Esys_PolicyGetDigest.c +++ b/src/tss2-esys/api/Esys_PolicyGetDigest.c @@ -157,47 +157,47 @@ Esys_PolicyGetDigest_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, policySession, &policySessionNode); - return_state_if_error(r, _ESYS_STATE_INIT, "policySession unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "policySession unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PolicyGetDigest_Prepare(esysContext->sys, (policySessionNode == NULL) ? TPM2_RH_NULL : policySessionNode->rsrc.handle); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, policySessionNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -247,12 +247,12 @@ Esys_PolicyGetDigest_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (policyDigest != NULL) { @@ -266,7 +266,7 @@ Esys_PolicyGetDigest_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -274,12 +274,12 @@ Esys_PolicyGetDigest_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -294,11 +294,11 @@ Esys_PolicyGetDigest_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -307,7 +307,7 @@ Esys_PolicyGetDigest_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -317,11 +317,11 @@ Esys_PolicyGetDigest_Finish( r = Tss2_Sys_PolicyGetDigest_Complete(esysContext->sys, (policyDigest != NULL) ? *policyDigest : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_PolicyLocality.c b/src/tss2-esys/api/Esys_PolicyLocality.c index 32ac4503b..7a0892cb3 100644 --- a/src/tss2-esys/api/Esys_PolicyLocality.c +++ b/src/tss2-esys/api/Esys_PolicyLocality.c @@ -163,15 +163,15 @@ Esys_PolicyLocality_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, policySession, &policySessionNode); - return_state_if_error(r, _ESYS_STATE_INIT, "policySession unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "policySession unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PolicyLocality_Prepare(esysContext->sys, @@ -179,32 +179,32 @@ Esys_PolicyLocality_Async( ? TPM2_RH_NULL : policySessionNode->rsrc.handle, locality); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, policySessionNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -250,18 +250,18 @@ Esys_PolicyLocality_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -269,12 +269,12 @@ Esys_PolicyLocality_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -289,11 +289,11 @@ Esys_PolicyLocality_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -302,7 +302,7 @@ Esys_PolicyLocality_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -310,10 +310,10 @@ Esys_PolicyLocality_Finish( * to deliver the result. */ r = Tss2_Sys_PolicyLocality_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_PolicyNV.c b/src/tss2-esys/api/Esys_PolicyNV.c index 00493fcd9..e682f20d3 100644 --- a/src/tss2-esys/api/Esys_PolicyNV.c +++ b/src/tss2-esys/api/Esys_PolicyNV.c @@ -181,19 +181,19 @@ Esys_PolicyNV_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, authHandle, &authHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authHandle unknown."); r = esys_GetResourceObject(esysContext, nvIndex, &nvIndexNode); - return_state_if_error(r, _ESYS_STATE_INIT, "nvIndex unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "nvIndex unknown."); r = esys_GetResourceObject(esysContext, policySession, &policySessionNode); - return_state_if_error(r, _ESYS_STATE_INIT, "policySession unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "policySession unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PolicyNV_Prepare(esysContext->sys, @@ -204,11 +204,11 @@ Esys_PolicyNV_Async( (policySessionNode == NULL) ? TPM2_RH_NULL : policySessionNode->rsrc.handle, operandB, offset, operation); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authHandleNode->rsrc.name, &authHandleNode->auth); @@ -220,21 +220,21 @@ Esys_PolicyNV_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authHandleNode, nvIndexNode, policySessionNode, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -280,18 +280,18 @@ Esys_PolicyNV_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -299,12 +299,12 @@ Esys_PolicyNV_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -319,11 +319,11 @@ Esys_PolicyNV_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -332,7 +332,7 @@ Esys_PolicyNV_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -340,10 +340,10 @@ Esys_PolicyNV_Finish( * to deliver the result. */ r = Tss2_Sys_PolicyNV_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_PolicyNameHash.c b/src/tss2-esys/api/Esys_PolicyNameHash.c index 9f37cb7b8..3243b6f31 100644 --- a/src/tss2-esys/api/Esys_PolicyNameHash.c +++ b/src/tss2-esys/api/Esys_PolicyNameHash.c @@ -163,15 +163,15 @@ Esys_PolicyNameHash_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, policySession, &policySessionNode); - return_state_if_error(r, _ESYS_STATE_INIT, "policySession unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "policySession unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PolicyNameHash_Prepare(esysContext->sys, @@ -179,32 +179,32 @@ Esys_PolicyNameHash_Async( ? TPM2_RH_NULL : policySessionNode->rsrc.handle, nameHash); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, policySessionNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -250,18 +250,18 @@ Esys_PolicyNameHash_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -269,12 +269,12 @@ Esys_PolicyNameHash_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -289,11 +289,11 @@ Esys_PolicyNameHash_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -302,7 +302,7 @@ Esys_PolicyNameHash_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -310,10 +310,10 @@ Esys_PolicyNameHash_Finish( * to deliver the result. */ r = Tss2_Sys_PolicyNameHash_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_PolicyNvWritten.c b/src/tss2-esys/api/Esys_PolicyNvWritten.c index 1fbbf18c7..21f9c6556 100644 --- a/src/tss2-esys/api/Esys_PolicyNvWritten.c +++ b/src/tss2-esys/api/Esys_PolicyNvWritten.c @@ -163,15 +163,15 @@ Esys_PolicyNvWritten_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, policySession, &policySessionNode); - return_state_if_error(r, _ESYS_STATE_INIT, "policySession unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "policySession unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PolicyNvWritten_Prepare(esysContext->sys, @@ -179,32 +179,32 @@ Esys_PolicyNvWritten_Async( ? TPM2_RH_NULL : policySessionNode->rsrc.handle, writtenSet); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, policySessionNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -250,18 +250,18 @@ Esys_PolicyNvWritten_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -269,12 +269,12 @@ Esys_PolicyNvWritten_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -289,11 +289,11 @@ Esys_PolicyNvWritten_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -302,7 +302,7 @@ Esys_PolicyNvWritten_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -310,10 +310,10 @@ Esys_PolicyNvWritten_Finish( * to deliver the result. */ r = Tss2_Sys_PolicyNvWritten_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_PolicyOR.c b/src/tss2-esys/api/Esys_PolicyOR.c index dbee7b065..e9d20b27a 100644 --- a/src/tss2-esys/api/Esys_PolicyOR.c +++ b/src/tss2-esys/api/Esys_PolicyOR.c @@ -163,46 +163,46 @@ Esys_PolicyOR_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, policySession, &policySessionNode); - return_state_if_error(r, _ESYS_STATE_INIT, "policySession unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "policySession unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PolicyOR_Prepare(esysContext->sys, (policySessionNode == NULL) ? TPM2_RH_NULL : policySessionNode->rsrc.handle, pHashList); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, policySessionNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -248,18 +248,18 @@ Esys_PolicyOR_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -267,12 +267,12 @@ Esys_PolicyOR_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -287,11 +287,11 @@ Esys_PolicyOR_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -300,7 +300,7 @@ Esys_PolicyOR_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -308,10 +308,10 @@ Esys_PolicyOR_Finish( * to deliver the result. */ r = Tss2_Sys_PolicyOR_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_PolicyPCR.c b/src/tss2-esys/api/Esys_PolicyPCR.c index 525a80a1b..5e084a661 100644 --- a/src/tss2-esys/api/Esys_PolicyPCR.c +++ b/src/tss2-esys/api/Esys_PolicyPCR.c @@ -164,47 +164,47 @@ Esys_PolicyPCR_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, policySession, &policySessionNode); - return_state_if_error(r, _ESYS_STATE_INIT, "policySession unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "policySession unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PolicyPCR_Prepare(esysContext->sys, (policySessionNode == NULL) ? TPM2_RH_NULL : policySessionNode->rsrc.handle, pcrDigest, pcrs); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, policySessionNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -250,18 +250,18 @@ Esys_PolicyPCR_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -269,12 +269,12 @@ Esys_PolicyPCR_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -289,11 +289,11 @@ Esys_PolicyPCR_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -302,7 +302,7 @@ Esys_PolicyPCR_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -310,10 +310,10 @@ Esys_PolicyPCR_Finish( * to deliver the result. */ r = Tss2_Sys_PolicyPCR_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_PolicyPassword.c b/src/tss2-esys/api/Esys_PolicyPassword.c index 7b0ea79e1..7ae8be80a 100644 --- a/src/tss2-esys/api/Esys_PolicyPassword.c +++ b/src/tss2-esys/api/Esys_PolicyPassword.c @@ -167,48 +167,48 @@ Esys_PolicyPassword_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters(esysContext, policySession); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, policySession, &policySessionNode); - return_state_if_error(r, _ESYS_STATE_INIT, "policySession unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "policySession unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PolicyPassword_Prepare(esysContext->sys, (policySessionNode == NULL) ? TPM2_RH_NULL : policySessionNode->rsrc.handle); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, policySessionNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -254,18 +254,18 @@ Esys_PolicyPassword_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -273,12 +273,12 @@ Esys_PolicyPassword_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -293,11 +293,11 @@ Esys_PolicyPassword_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -306,7 +306,7 @@ Esys_PolicyPassword_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -314,7 +314,7 @@ Esys_PolicyPassword_Finish( * to deliver the result. */ r = Tss2_Sys_PolicyPassword_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); ESYS_TR policySession = esysContext->in.Policy.policySession; @@ -326,7 +326,7 @@ Esys_PolicyPassword_Finish( /* Indicate that the authValue of authorized object will be checked */ policySessionNode->rsrc.misc.rsrc_session.type_policy_session = POLICY_PASSWORD; - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_PolicyPhysicalPresence.c b/src/tss2-esys/api/Esys_PolicyPhysicalPresence.c index 7f3198ba1..625c18326 100644 --- a/src/tss2-esys/api/Esys_PolicyPhysicalPresence.c +++ b/src/tss2-esys/api/Esys_PolicyPhysicalPresence.c @@ -159,47 +159,47 @@ Esys_PolicyPhysicalPresence_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, policySession, &policySessionNode); - return_state_if_error(r, _ESYS_STATE_INIT, "policySession unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "policySession unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PolicyPhysicalPresence_Prepare(esysContext->sys, (policySessionNode == NULL) ? TPM2_RH_NULL : policySessionNode->rsrc.handle); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, policySessionNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -245,18 +245,18 @@ Esys_PolicyPhysicalPresence_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -264,12 +264,12 @@ Esys_PolicyPhysicalPresence_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -284,11 +284,11 @@ Esys_PolicyPhysicalPresence_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -297,7 +297,7 @@ Esys_PolicyPhysicalPresence_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -305,10 +305,10 @@ Esys_PolicyPhysicalPresence_Finish( * to deliver the result. */ r = Tss2_Sys_PolicyPhysicalPresence_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_PolicyRestart.c b/src/tss2-esys/api/Esys_PolicyRestart.c index c7e764fb6..0f78f0969 100644 --- a/src/tss2-esys/api/Esys_PolicyRestart.c +++ b/src/tss2-esys/api/Esys_PolicyRestart.c @@ -159,46 +159,46 @@ Esys_PolicyRestart_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, sessionHandle, &sessionHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "sessionHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "sessionHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PolicyRestart_Prepare(esysContext->sys, (sessionHandleNode == NULL) ? TPM2_RH_NULL : sessionHandleNode->rsrc.handle); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, sessionHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -244,18 +244,18 @@ Esys_PolicyRestart_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -263,12 +263,12 @@ Esys_PolicyRestart_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -283,11 +283,11 @@ Esys_PolicyRestart_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -296,7 +296,7 @@ Esys_PolicyRestart_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -304,10 +304,10 @@ Esys_PolicyRestart_Finish( * to deliver the result. */ r = Tss2_Sys_PolicyRestart_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_PolicySecret.c b/src/tss2-esys/api/Esys_PolicySecret.c index b097ceacc..0d6266ab2 100644 --- a/src/tss2-esys/api/Esys_PolicySecret.c +++ b/src/tss2-esys/api/Esys_PolicySecret.c @@ -187,17 +187,17 @@ Esys_PolicySecret_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, authHandle, &authHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authHandle unknown."); r = esys_GetResourceObject(esysContext, policySession, &policySessionNode); - return_state_if_error(r, _ESYS_STATE_INIT, "policySession unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "policySession unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PolicySecret_Prepare(esysContext->sys, @@ -206,11 +206,11 @@ Esys_PolicySecret_Async( (policySessionNode == NULL) ? TPM2_RH_NULL : policySessionNode->rsrc.handle, nonceTPM, cpHashA, policyRef, expiration); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authHandleNode->rsrc.name, &authHandleNode->auth); @@ -222,21 +222,21 @@ Esys_PolicySecret_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authHandleNode, policySessionNode, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -291,12 +291,12 @@ Esys_PolicySecret_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (timeout != NULL) { @@ -316,7 +316,7 @@ Esys_PolicySecret_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -324,12 +324,12 @@ Esys_PolicySecret_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -344,11 +344,11 @@ Esys_PolicySecret_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -357,7 +357,7 @@ Esys_PolicySecret_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -368,11 +368,11 @@ Esys_PolicySecret_Finish( (timeout != NULL) ? *timeout : NULL, (policyTicket != NULL) ? *policyTicket : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_PolicySigned.c b/src/tss2-esys/api/Esys_PolicySigned.c index 195b177e1..93b768621 100644 --- a/src/tss2-esys/api/Esys_PolicySigned.c +++ b/src/tss2-esys/api/Esys_PolicySigned.c @@ -191,17 +191,17 @@ Esys_PolicySigned_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, authObject, &authObjectNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authObject unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authObject unknown."); r = esys_GetResourceObject(esysContext, policySession, &policySessionNode); - return_state_if_error(r, _ESYS_STATE_INIT, "policySession unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "policySession unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PolicySigned_Prepare(esysContext->sys, @@ -211,32 +211,32 @@ Esys_PolicySigned_Async( : policySessionNode->rsrc.handle, nonceTPM, cpHashA, policyRef, expiration, auth); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authObjectNode, policySessionNode, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -291,12 +291,12 @@ Esys_PolicySigned_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (timeout != NULL) { @@ -316,7 +316,7 @@ Esys_PolicySigned_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -324,12 +324,12 @@ Esys_PolicySigned_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -344,11 +344,11 @@ Esys_PolicySigned_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -357,7 +357,7 @@ Esys_PolicySigned_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -368,11 +368,11 @@ Esys_PolicySigned_Finish( (timeout != NULL) ? *timeout : NULL, (policyTicket != NULL) ? *policyTicket : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_PolicyTemplate.c b/src/tss2-esys/api/Esys_PolicyTemplate.c index eda3fb670..3d0633130 100644 --- a/src/tss2-esys/api/Esys_PolicyTemplate.c +++ b/src/tss2-esys/api/Esys_PolicyTemplate.c @@ -163,15 +163,15 @@ Esys_PolicyTemplate_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, policySession, &policySessionNode); - return_state_if_error(r, _ESYS_STATE_INIT, "policySession unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "policySession unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PolicyTemplate_Prepare(esysContext->sys, @@ -179,32 +179,32 @@ Esys_PolicyTemplate_Async( ? TPM2_RH_NULL : policySessionNode->rsrc.handle, templateHash); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, policySessionNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -250,18 +250,18 @@ Esys_PolicyTemplate_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -269,12 +269,12 @@ Esys_PolicyTemplate_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -289,11 +289,11 @@ Esys_PolicyTemplate_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -302,7 +302,7 @@ Esys_PolicyTemplate_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -310,10 +310,10 @@ Esys_PolicyTemplate_Finish( * to deliver the result. */ r = Tss2_Sys_PolicyTemplate_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_PolicyTicket.c b/src/tss2-esys/api/Esys_PolicyTicket.c index 05d79425b..b620ca941 100644 --- a/src/tss2-esys/api/Esys_PolicyTicket.c +++ b/src/tss2-esys/api/Esys_PolicyTicket.c @@ -183,47 +183,47 @@ Esys_PolicyTicket_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, policySession, &policySessionNode); - return_state_if_error(r, _ESYS_STATE_INIT, "policySession unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "policySession unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_PolicyTicket_Prepare(esysContext->sys, (policySessionNode == NULL) ? TPM2_RH_NULL : policySessionNode->rsrc.handle, timeout, cpHashA, policyRef, authName, ticket); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, policySessionNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -269,18 +269,18 @@ Esys_PolicyTicket_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -288,12 +288,12 @@ Esys_PolicyTicket_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -308,11 +308,11 @@ Esys_PolicyTicket_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -321,7 +321,7 @@ Esys_PolicyTicket_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -329,10 +329,10 @@ Esys_PolicyTicket_Finish( * to deliver the result. */ r = Tss2_Sys_PolicyTicket_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_Policy_AC_SendSelect.c b/src/tss2-esys/api/Esys_Policy_AC_SendSelect.c index 7e412bd92..91f77427c 100644 --- a/src/tss2-esys/api/Esys_Policy_AC_SendSelect.c +++ b/src/tss2-esys/api/Esys_Policy_AC_SendSelect.c @@ -166,16 +166,16 @@ TSS2_RC Esys_Policy_AC_SendSelect_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(policySession1, optionalSession2, optionalSession3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, policySession1, &policySessionNode); - return_state_if_error(r, _ESYS_STATE_INIT, "policySession unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "policySession unknown."); r = Tss2_Sys_Policy_AC_SendSelect_Prepare(esysContext->sys, (policySessionNode == NULL) @@ -183,33 +183,33 @@ TSS2_RC Esys_Policy_AC_SendSelect_Async( : policySessionNode->rsrc.handle, objectName, authHandleName, acName, includeObject); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, policySession1, optionalSession2, optionalSession3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources");\ + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources");\ iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, policySessionNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -254,18 +254,18 @@ TSS2_RC Esys_Policy_AC_SendSelect_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -273,12 +273,12 @@ TSS2_RC Esys_Policy_AC_SendSelect_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -293,11 +293,11 @@ TSS2_RC Esys_Policy_AC_SendSelect_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -306,7 +306,7 @@ TSS2_RC Esys_Policy_AC_SendSelect_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -314,10 +314,10 @@ TSS2_RC Esys_Policy_AC_SendSelect_Finish( * to deliver the result. */ r = Tss2_Sys_Policy_AC_SendSelect_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_Quote.c b/src/tss2-esys/api/Esys_Quote.c index 1732628aa..d231810ed 100644 --- a/src/tss2-esys/api/Esys_Quote.c +++ b/src/tss2-esys/api/Esys_Quote.c @@ -168,26 +168,26 @@ Esys_Quote_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, signHandle, &signHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "signHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "signHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_Quote_Prepare(esysContext->sys, (signHandleNode == NULL) ? TPM2_RH_NULL : signHandleNode->rsrc.handle, qualifyingData, inScheme, PCRselect); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (signHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &signHandleNode->rsrc.name, &signHandleNode->auth); @@ -199,21 +199,21 @@ Esys_Quote_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, signHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -265,12 +265,12 @@ Esys_Quote_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (quoted != NULL) { @@ -290,7 +290,7 @@ Esys_Quote_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -298,12 +298,12 @@ Esys_Quote_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -318,11 +318,11 @@ Esys_Quote_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -331,7 +331,7 @@ Esys_Quote_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -341,11 +341,11 @@ Esys_Quote_Finish( r = Tss2_Sys_Quote_Complete(esysContext->sys, (quoted != NULL) ? *quoted : NULL, (signature != NULL) ? *signature : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_RSA_Decrypt.c b/src/tss2-esys/api/Esys_RSA_Decrypt.c index 38f8d9524..63e52166a 100644 --- a/src/tss2-esys/api/Esys_RSA_Decrypt.c +++ b/src/tss2-esys/api/Esys_RSA_Decrypt.c @@ -165,26 +165,26 @@ Esys_RSA_Decrypt_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, keyHandle, &keyHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "keyHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "keyHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_RSA_Decrypt_Prepare(esysContext->sys, (keyHandleNode == NULL) ? TPM2_RH_NULL : keyHandleNode->rsrc.handle, cipherText, inScheme, label); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (keyHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &keyHandleNode->rsrc.name, &keyHandleNode->auth); @@ -196,21 +196,21 @@ Esys_RSA_Decrypt_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, keyHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -259,12 +259,12 @@ Esys_RSA_Decrypt_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (message != NULL) { @@ -278,7 +278,7 @@ Esys_RSA_Decrypt_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -286,12 +286,12 @@ Esys_RSA_Decrypt_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -306,11 +306,11 @@ Esys_RSA_Decrypt_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -319,7 +319,7 @@ Esys_RSA_Decrypt_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -328,11 +328,11 @@ Esys_RSA_Decrypt_Finish( */ r = Tss2_Sys_RSA_Decrypt_Complete(esysContext->sys, (message != NULL) ? *message : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_RSA_Encrypt.c b/src/tss2-esys/api/Esys_RSA_Encrypt.c index a8fe2eefe..fdc51db5a 100644 --- a/src/tss2-esys/api/Esys_RSA_Encrypt.c +++ b/src/tss2-esys/api/Esys_RSA_Encrypt.c @@ -167,47 +167,47 @@ Esys_RSA_Encrypt_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, keyHandle, &keyHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "keyHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "keyHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_RSA_Encrypt_Prepare(esysContext->sys, (keyHandleNode == NULL) ? TPM2_RH_NULL : keyHandleNode->rsrc.handle, message, inScheme, label); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, keyHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -256,12 +256,12 @@ Esys_RSA_Encrypt_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (outData != NULL) { @@ -275,7 +275,7 @@ Esys_RSA_Encrypt_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -283,12 +283,12 @@ Esys_RSA_Encrypt_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -303,11 +303,11 @@ Esys_RSA_Encrypt_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -316,7 +316,7 @@ Esys_RSA_Encrypt_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -325,11 +325,11 @@ Esys_RSA_Encrypt_Finish( */ r = Tss2_Sys_RSA_Encrypt_Complete(esysContext->sys, (outData != NULL) ? *outData : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_ReadClock.c b/src/tss2-esys/api/Esys_ReadClock.c index 560030e59..154d17229 100644 --- a/src/tss2-esys/api/Esys_ReadClock.c +++ b/src/tss2-esys/api/Esys_ReadClock.c @@ -149,40 +149,40 @@ Esys_ReadClock_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_ReadClock_Prepare(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, NULL, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -231,12 +231,12 @@ Esys_ReadClock_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (currentTime != NULL) { @@ -250,7 +250,7 @@ Esys_ReadClock_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -258,12 +258,12 @@ Esys_ReadClock_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -278,11 +278,11 @@ Esys_ReadClock_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -291,7 +291,7 @@ Esys_ReadClock_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -301,11 +301,11 @@ Esys_ReadClock_Finish( r = Tss2_Sys_ReadClock_Complete(esysContext->sys, (currentTime != NULL) ? *currentTime : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_ReadPublic.c b/src/tss2-esys/api/Esys_ReadPublic.c index a0accfd15..ebcca9f7c 100644 --- a/src/tss2-esys/api/Esys_ReadPublic.c +++ b/src/tss2-esys/api/Esys_ReadPublic.c @@ -162,46 +162,46 @@ Esys_ReadPublic_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, objectHandle, &objectHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "objectHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "objectHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_ReadPublic_Prepare(esysContext->sys, (objectHandleNode == NULL) ? TPM2_RH_NULL : objectHandleNode->rsrc.handle); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, objectHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -258,12 +258,12 @@ Esys_ReadPublic_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Initialize parameter to avoid unitialized usage */ if (qualifiedName != NULL) @@ -293,7 +293,7 @@ Esys_ReadPublic_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -301,12 +301,12 @@ Esys_ReadPublic_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -321,11 +321,11 @@ Esys_ReadPublic_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -334,7 +334,7 @@ Esys_ReadPublic_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -346,11 +346,11 @@ Esys_ReadPublic_Finish( (name != NULL) ? *name : NULL, (qualifiedName != NULL) ? *qualifiedName : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_Rewrap.c b/src/tss2-esys/api/Esys_Rewrap.c index fad2a12a4..220e2a41d 100644 --- a/src/tss2-esys/api/Esys_Rewrap.c +++ b/src/tss2-esys/api/Esys_Rewrap.c @@ -176,17 +176,17 @@ Esys_Rewrap_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, oldParent, &oldParentNode); - return_state_if_error(r, _ESYS_STATE_INIT, "oldParent unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "oldParent unknown."); r = esys_GetResourceObject(esysContext, newParent, &newParentNode); - return_state_if_error(r, _ESYS_STATE_INIT, "newParent unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "newParent unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_Rewrap_Prepare(esysContext->sys, @@ -195,11 +195,11 @@ Esys_Rewrap_Async( (newParentNode == NULL) ? TPM2_RH_NULL : newParentNode->rsrc.handle, inDuplicate, name, inSymSeed); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (oldParentNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &oldParentNode->rsrc.name, &oldParentNode->auth); @@ -211,21 +211,21 @@ Esys_Rewrap_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, oldParentNode, newParentNode, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -279,12 +279,12 @@ Esys_Rewrap_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (outDuplicate != NULL) { @@ -304,7 +304,7 @@ Esys_Rewrap_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -312,12 +312,12 @@ Esys_Rewrap_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -332,11 +332,11 @@ Esys_Rewrap_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -345,7 +345,7 @@ Esys_Rewrap_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -355,11 +355,11 @@ Esys_Rewrap_Finish( r = Tss2_Sys_Rewrap_Complete(esysContext->sys, (outDuplicate != NULL) ? *outDuplicate : NULL, (outSymSeed != NULL) ? *outSymSeed : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_SelfTest.c b/src/tss2-esys/api/Esys_SelfTest.c index e6af38af7..5a49ad88c 100644 --- a/src/tss2-esys/api/Esys_SelfTest.c +++ b/src/tss2-esys/api/Esys_SelfTest.c @@ -151,40 +151,40 @@ Esys_SelfTest_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_SelfTest_Prepare(esysContext->sys, fullTest); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, NULL, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -230,18 +230,18 @@ Esys_SelfTest_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -249,12 +249,12 @@ Esys_SelfTest_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -269,11 +269,11 @@ Esys_SelfTest_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -282,7 +282,7 @@ Esys_SelfTest_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -290,10 +290,10 @@ Esys_SelfTest_Finish( * to deliver the result. */ r = Tss2_Sys_SelfTest_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_SequenceComplete.c b/src/tss2-esys/api/Esys_SequenceComplete.c index dbf0d0500..832bb965a 100644 --- a/src/tss2-esys/api/Esys_SequenceComplete.c +++ b/src/tss2-esys/api/Esys_SequenceComplete.c @@ -181,16 +181,16 @@ Esys_SequenceComplete_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters(esysContext, sequenceHandle); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, sequenceHandle, &sequenceHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "sequenceHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "sequenceHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_SequenceComplete_Prepare(esysContext->sys, @@ -198,11 +198,11 @@ Esys_SequenceComplete_Async( ? TPM2_RH_NULL : sequenceHandleNode->rsrc.handle, buffer, tpm_hierarchy); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (sequenceHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &sequenceHandleNode->rsrc.name, &sequenceHandleNode->auth); @@ -214,21 +214,21 @@ Esys_SequenceComplete_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, sequenceHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -281,12 +281,12 @@ Esys_SequenceComplete_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (result != NULL) { @@ -306,7 +306,7 @@ Esys_SequenceComplete_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -314,12 +314,12 @@ Esys_SequenceComplete_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -334,11 +334,11 @@ Esys_SequenceComplete_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -347,7 +347,7 @@ Esys_SequenceComplete_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -358,7 +358,7 @@ Esys_SequenceComplete_Finish( (result != NULL) ? *result : NULL, (validation != NULL) ? *validation : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); @@ -367,7 +367,7 @@ Esys_SequenceComplete_Finish( &esysContext->in.SequenceComplete.sequenceHandle); goto_if_error(r, "invalidate object", error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_SequenceUpdate.c b/src/tss2-esys/api/Esys_SequenceUpdate.c index 32995988a..22e8f29c7 100644 --- a/src/tss2-esys/api/Esys_SequenceUpdate.c +++ b/src/tss2-esys/api/Esys_SequenceUpdate.c @@ -157,15 +157,15 @@ Esys_SequenceUpdate_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, sequenceHandle, &sequenceHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "sequenceHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "sequenceHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_SequenceUpdate_Prepare(esysContext->sys, @@ -173,11 +173,11 @@ Esys_SequenceUpdate_Async( ? TPM2_RH_NULL : sequenceHandleNode->rsrc.handle, buffer); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (sequenceHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &sequenceHandleNode->rsrc.name, &sequenceHandleNode->auth); @@ -189,21 +189,21 @@ Esys_SequenceUpdate_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, sequenceHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -249,18 +249,18 @@ Esys_SequenceUpdate_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -268,12 +268,12 @@ Esys_SequenceUpdate_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -288,11 +288,11 @@ Esys_SequenceUpdate_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -301,7 +301,7 @@ Esys_SequenceUpdate_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -309,10 +309,10 @@ Esys_SequenceUpdate_Finish( * to deliver the result. */ r = Tss2_Sys_SequenceUpdate_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_SetAlgorithmSet.c b/src/tss2-esys/api/Esys_SetAlgorithmSet.c index 2170427c6..abe3ee5c8 100644 --- a/src/tss2-esys/api/Esys_SetAlgorithmSet.c +++ b/src/tss2-esys/api/Esys_SetAlgorithmSet.c @@ -165,26 +165,26 @@ Esys_SetAlgorithmSet_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, authHandle, &authHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_SetAlgorithmSet_Prepare(esysContext->sys, (authHandleNode == NULL) ? TPM2_RH_NULL : authHandleNode->rsrc.handle, algorithmSet); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authHandleNode->rsrc.name, &authHandleNode->auth); @@ -196,21 +196,21 @@ Esys_SetAlgorithmSet_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -256,18 +256,18 @@ Esys_SetAlgorithmSet_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -275,12 +275,12 @@ Esys_SetAlgorithmSet_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -295,11 +295,11 @@ Esys_SetAlgorithmSet_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -308,7 +308,7 @@ Esys_SetAlgorithmSet_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -316,10 +316,10 @@ Esys_SetAlgorithmSet_Finish( * to deliver the result. */ r = Tss2_Sys_SetAlgorithmSet_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_SetCommandCodeAuditStatus.c b/src/tss2-esys/api/Esys_SetCommandCodeAuditStatus.c index 77498b33d..197d3b559 100644 --- a/src/tss2-esys/api/Esys_SetCommandCodeAuditStatus.c +++ b/src/tss2-esys/api/Esys_SetCommandCodeAuditStatus.c @@ -177,15 +177,15 @@ Esys_SetCommandCodeAuditStatus_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, auth, &authNode); - return_state_if_error(r, _ESYS_STATE_INIT, "auth unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "auth unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_SetCommandCodeAuditStatus_Prepare(esysContext->sys, @@ -194,11 +194,11 @@ Esys_SetCommandCodeAuditStatus_Async( : authNode->rsrc.handle, auditAlg, setList, clearList); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authNode->rsrc.name, &authNode->auth); @@ -210,21 +210,21 @@ Esys_SetCommandCodeAuditStatus_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -270,18 +270,18 @@ Esys_SetCommandCodeAuditStatus_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -289,12 +289,12 @@ Esys_SetCommandCodeAuditStatus_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -309,11 +309,11 @@ Esys_SetCommandCodeAuditStatus_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -322,7 +322,7 @@ Esys_SetCommandCodeAuditStatus_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -330,10 +330,10 @@ Esys_SetCommandCodeAuditStatus_Finish( * to deliver the result. */ r = Tss2_Sys_SetCommandCodeAuditStatus_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_SetPrimaryPolicy.c b/src/tss2-esys/api/Esys_SetPrimaryPolicy.c index 484a2548c..537c24981 100644 --- a/src/tss2-esys/api/Esys_SetPrimaryPolicy.c +++ b/src/tss2-esys/api/Esys_SetPrimaryPolicy.c @@ -166,26 +166,26 @@ Esys_SetPrimaryPolicy_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, authHandle, &authHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "authHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "authHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_SetPrimaryPolicy_Prepare(esysContext->sys, (authHandleNode == NULL) ? TPM2_RH_NULL : authHandleNode->rsrc.handle, authPolicy, hashAlg); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (authHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &authHandleNode->rsrc.name, &authHandleNode->auth); @@ -197,21 +197,21 @@ Esys_SetPrimaryPolicy_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, authHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -257,18 +257,18 @@ Esys_SetPrimaryPolicy_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -276,12 +276,12 @@ Esys_SetPrimaryPolicy_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -296,11 +296,11 @@ Esys_SetPrimaryPolicy_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -309,7 +309,7 @@ Esys_SetPrimaryPolicy_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -317,10 +317,10 @@ Esys_SetPrimaryPolicy_Finish( * to deliver the result. */ r = Tss2_Sys_SetPrimaryPolicy_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_Shutdown.c b/src/tss2-esys/api/Esys_Shutdown.c index 7661bdecd..5276aa856 100644 --- a/src/tss2-esys/api/Esys_Shutdown.c +++ b/src/tss2-esys/api/Esys_Shutdown.c @@ -151,40 +151,40 @@ Esys_Shutdown_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_Shutdown_Prepare(esysContext->sys, shutdownType); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, NULL, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -230,18 +230,18 @@ Esys_Shutdown_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -249,12 +249,12 @@ Esys_Shutdown_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -269,11 +269,11 @@ Esys_Shutdown_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -282,7 +282,7 @@ Esys_Shutdown_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -290,10 +290,10 @@ Esys_Shutdown_Finish( * to deliver the result. */ r = Tss2_Sys_Shutdown_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_Sign.c b/src/tss2-esys/api/Esys_Sign.c index 13f9c2cdb..445c91710 100644 --- a/src/tss2-esys/api/Esys_Sign.c +++ b/src/tss2-esys/api/Esys_Sign.c @@ -171,26 +171,26 @@ Esys_Sign_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, keyHandle, &keyHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "keyHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "keyHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_Sign_Prepare(esysContext->sys, (keyHandleNode == NULL) ? TPM2_RH_NULL : keyHandleNode->rsrc.handle, digest, inScheme, validation); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (keyHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &keyHandleNode->rsrc.name, &keyHandleNode->auth); @@ -202,21 +202,21 @@ Esys_Sign_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, keyHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -265,12 +265,12 @@ Esys_Sign_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (signature != NULL) { @@ -284,7 +284,7 @@ Esys_Sign_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -292,12 +292,12 @@ Esys_Sign_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -312,11 +312,11 @@ Esys_Sign_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -325,7 +325,7 @@ Esys_Sign_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -334,11 +334,11 @@ Esys_Sign_Finish( */ r = Tss2_Sys_Sign_Complete(esysContext->sys, (signature != NULL) ? *signature : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_StartAuthSession.c b/src/tss2-esys/api/Esys_StartAuthSession.c index 076760d0b..a603ccd0e 100644 --- a/src/tss2-esys/api/Esys_StartAuthSession.c +++ b/src/tss2-esys/api/Esys_StartAuthSession.c @@ -213,33 +213,33 @@ Esys_StartAuthSession_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); store_input_parameters(esysContext, tpmKey, bind, nonceCaller, sessionType, symmetric, authHash); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, tpmKey, &tpmKeyNode); - return_state_if_error(r, _ESYS_STATE_INIT, "tpmKey unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "tpmKey unknown."); r = esys_GetResourceObject(esysContext, bind, &bindNode); - return_state_if_error(r, _ESYS_STATE_INIT, "bind unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "bind unknown."); size_t authHash_size = 0; TSS2_RC r2; r2 = iesys_compute_encrypted_salt(esysContext, tpmKeyNode, &encryptedSaltAux); - return_state_if_error(r2, _ESYS_STATE_INIT, "Error in parameter encryption."); + return_state_if_error(r2, ESYS_STATE_INIT, "Error in parameter encryption."); if (nonceCaller == NULL) { r2 = iesys_crypto_hash_get_digest_size(authHash,&authHash_size); - return_state_if_error(r2, _ESYS_STATE_INIT, "Error in hash_get_digest_size."); + return_state_if_error(r2, ESYS_STATE_INIT, "Error in hash_get_digest_size."); r2 = iesys_crypto_get_random2b(&esysContext->crypto_backend, &esysContext->in.StartAuthSession.nonceCallerData, authHash_size); - return_state_if_error(r2, _ESYS_STATE_INIT, "Error in crypto_random2b."); + return_state_if_error(r2, ESYS_STATE_INIT, "Error in crypto_random2b."); esysContext->in.StartAuthSession.nonceCaller = &esysContext->in.StartAuthSession.nonceCallerData; nonceCaller = esysContext->in.StartAuthSession.nonceCaller; @@ -253,11 +253,11 @@ Esys_StartAuthSession_Async( : bindNode->rsrc.handle, nonceCaller, encryptedSalt, sessionType, symmetric, authHash); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); @@ -272,25 +272,25 @@ Esys_StartAuthSession_Async( none.rsrc.name.name, sizeof(none.rsrc.name.name), &offset); - return_state_if_error(r, _ESYS_STATE_INIT, "Marshaling TPM handle."); + return_state_if_error(r, ESYS_STATE_INIT, "Marshaling TPM handle."); none.rsrc.name.size = offset; r = iesys_gen_auths(esysContext, tpmKeyNode ? tpmKeyNode : &none, bindNode ? bindNode : &none, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -338,12 +338,12 @@ Esys_StartAuthSession_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; RSRC_NODE_T *sessionHandleNode = NULL; /* Allocate memory for response parameters */ @@ -368,7 +368,7 @@ Esys_StartAuthSession_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -376,12 +376,12 @@ Esys_StartAuthSession_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -396,11 +396,11 @@ Esys_StartAuthSession_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -409,7 +409,7 @@ Esys_StartAuthSession_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -419,7 +419,7 @@ Esys_StartAuthSession_Finish( r = Tss2_Sys_StartAuthSession_Complete(esysContext->sys, &sessionHandleNode->rsrc.handle, &lnonceTPM); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); @@ -504,7 +504,7 @@ Esys_StartAuthSession_Finish( sessionHandleNode->rsrc.name.size = offset; memset(&esysContext->salt, '\0', sizeof(esysContext->salt)); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_Startup.c b/src/tss2-esys/api/Esys_Startup.c index c4be55703..5df69ab91 100644 --- a/src/tss2-esys/api/Esys_Startup.c +++ b/src/tss2-esys/api/Esys_Startup.c @@ -117,17 +117,17 @@ Esys_Startup_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_Startup_Prepare(esysContext->sys, startupType); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -173,18 +173,18 @@ Esys_Startup_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -192,12 +192,12 @@ Esys_Startup_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -212,18 +212,18 @@ Esys_Startup_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r) && r != TPM2_RC_INITIALIZE) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS && r != TPM2_RC_INITIALIZE) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } r = Tss2_Sys_Startup_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_StirRandom.c b/src/tss2-esys/api/Esys_StirRandom.c index ac1afc375..7c96c24e9 100644 --- a/src/tss2-esys/api/Esys_StirRandom.c +++ b/src/tss2-esys/api/Esys_StirRandom.c @@ -145,40 +145,40 @@ Esys_StirRandom_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_StirRandom_Prepare(esysContext->sys, inData); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, NULL, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -224,18 +224,18 @@ Esys_StirRandom_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -243,12 +243,12 @@ Esys_StirRandom_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -263,11 +263,11 @@ Esys_StirRandom_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -276,7 +276,7 @@ Esys_StirRandom_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -284,10 +284,10 @@ Esys_StirRandom_Finish( * to deliver the result. */ r = Tss2_Sys_StirRandom_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_TestParms.c b/src/tss2-esys/api/Esys_TestParms.c index d4568fd2f..c206c9c57 100644 --- a/src/tss2-esys/api/Esys_TestParms.c +++ b/src/tss2-esys/api/Esys_TestParms.c @@ -153,40 +153,40 @@ Esys_TestParms_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_TestParms_Prepare(esysContext->sys, parameters); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, NULL, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -232,18 +232,18 @@ Esys_TestParms_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /*Receive the TPM response and handle resubmissions if necessary. */ r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } /* This block handle the resubmission of TPM commands given a certain set of @@ -251,12 +251,12 @@ Esys_TestParms_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -273,11 +273,11 @@ Esys_TestParms_Finish( if (!tss2_is_expected_error(r)) { LOG_WARNING("Received TPM Error"); } - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return r; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; return r; } @@ -286,7 +286,7 @@ Esys_TestParms_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response"); /* @@ -294,10 +294,10 @@ Esys_TestParms_Finish( * to deliver the result. */ r = Tss2_Sys_TestParms_Complete(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" ); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/api/Esys_Unseal.c b/src/tss2-esys/api/Esys_Unseal.c index cd05efcbc..000429d7e 100644 --- a/src/tss2-esys/api/Esys_Unseal.c +++ b/src/tss2-esys/api/Esys_Unseal.c @@ -156,25 +156,25 @@ Esys_Unseal_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, itemHandle, &itemHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "itemHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "itemHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_Unseal_Prepare(esysContext->sys, (itemHandleNode == NULL) ? TPM2_RH_NULL : itemHandleNode->rsrc.handle); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (itemHandleNode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &itemHandleNode->rsrc.name, &itemHandleNode->auth); @@ -186,21 +186,21 @@ Esys_Unseal_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, itemHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -249,12 +249,12 @@ Esys_Unseal_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (outData != NULL) { @@ -268,7 +268,7 @@ Esys_Unseal_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -276,12 +276,12 @@ Esys_Unseal_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -296,11 +296,11 @@ Esys_Unseal_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -309,7 +309,7 @@ Esys_Unseal_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -318,11 +318,11 @@ Esys_Unseal_Finish( */ r = Tss2_Sys_Unseal_Complete(esysContext->sys, (outData != NULL) ? *outData : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_Vendor_TCG_Test.c b/src/tss2-esys/api/Esys_Vendor_TCG_Test.c index 77b5e9413..9db3b3d0b 100644 --- a/src/tss2-esys/api/Esys_Vendor_TCG_Test.c +++ b/src/tss2-esys/api/Esys_Vendor_TCG_Test.c @@ -142,40 +142,40 @@ Esys_Vendor_TCG_Test_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_Vendor_TCG_Test_Prepare(esysContext->sys, inputData); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, NULL, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -224,12 +224,12 @@ Esys_Vendor_TCG_Test_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (outputData != NULL) { @@ -243,7 +243,7 @@ Esys_Vendor_TCG_Test_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -251,12 +251,12 @@ Esys_Vendor_TCG_Test_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -271,11 +271,11 @@ Esys_Vendor_TCG_Test_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -284,7 +284,7 @@ Esys_Vendor_TCG_Test_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -294,11 +294,11 @@ Esys_Vendor_TCG_Test_Finish( r = Tss2_Sys_Vendor_TCG_Test_Complete(esysContext->sys, (outputData != NULL) ? *outputData : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_VerifySignature.c b/src/tss2-esys/api/Esys_VerifySignature.c index 2aea5c2a5..d3fab2d0d 100644 --- a/src/tss2-esys/api/Esys_VerifySignature.c +++ b/src/tss2-esys/api/Esys_VerifySignature.c @@ -167,47 +167,47 @@ Esys_VerifySignature_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, keyHandle, &keyHandleNode); - return_state_if_error(r, _ESYS_STATE_INIT, "keyHandle unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "keyHandle unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_VerifySignature_Prepare(esysContext->sys, (keyHandleNode == NULL) ? TPM2_RH_NULL : keyHandleNode->rsrc.handle, digest, signature); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); iesys_compute_session_value(esysContext->session_tab[0], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[1], NULL, NULL); iesys_compute_session_value(esysContext->session_tab[2], NULL, NULL); /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, keyHandleNode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -256,12 +256,12 @@ Esys_VerifySignature_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (validation != NULL) { @@ -275,7 +275,7 @@ Esys_VerifySignature_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -283,12 +283,12 @@ Esys_VerifySignature_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -303,11 +303,11 @@ Esys_VerifySignature_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -316,7 +316,7 @@ Esys_VerifySignature_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -326,11 +326,11 @@ Esys_VerifySignature_Finish( r = Tss2_Sys_VerifySignature_Complete(esysContext->sys, (validation != NULL) ? *validation : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/api/Esys_ZGen_2Phase.c b/src/tss2-esys/api/Esys_ZGen_2Phase.c index 319bc8822..046347fb3 100644 --- a/src/tss2-esys/api/Esys_ZGen_2Phase.c +++ b/src/tss2-esys/api/Esys_ZGen_2Phase.c @@ -173,26 +173,26 @@ Esys_ZGen_2Phase_Async( r = iesys_check_sequence_async(esysContext); if (r != TSS2_RC_SUCCESS) return r; - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); - return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); + return_state_if_error(r, ESYS_STATE_INIT, "Check session usage"); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, keyA, &keyANode); - return_state_if_error(r, _ESYS_STATE_INIT, "keyA unknown."); + return_state_if_error(r, ESYS_STATE_INIT, "keyA unknown."); /* Initial invocation of SAPI to prepare the command buffer with parameters */ r = Tss2_Sys_ZGen_2Phase_Prepare(esysContext->sys, (keyANode == NULL) ? TPM2_RH_NULL : keyANode->rsrc.handle, inQsB, inQeB, inScheme, counter); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI Prepare returned error."); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI Prepare returned error."); /* Calculate the cpHash Values */ r = init_session_tab(esysContext, shandle1, shandle2, shandle3); - return_state_if_error(r, _ESYS_STATE_INIT, "Initialize session resources"); + return_state_if_error(r, ESYS_STATE_INIT, "Initialize session resources"); if (keyANode != NULL) iesys_compute_session_value(esysContext->session_tab[0], &keyANode->rsrc.name, &keyANode->auth); @@ -204,21 +204,21 @@ Esys_ZGen_2Phase_Async( /* Generate the auth values and set them in the SAPI command buffer */ r = iesys_gen_auths(esysContext, keyANode, NULL, NULL, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, + return_state_if_error(r, ESYS_STATE_INIT, "Error in computation of auth values"); esysContext->authsCount = auths.count; if (auths.count > 0) { r = Tss2_Sys_SetCmdAuths(esysContext->sys, &auths); - return_state_if_error(r, _ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); + return_state_if_error(r, ESYS_STATE_INIT, "SAPI error on SetCmdAuths"); } /* Trigger execution and finish the async invocation */ r = Tss2_Sys_ExecuteAsync(esysContext->sys); - return_state_if_error(r, _ESYS_STATE_INTERNALERROR, + return_state_if_error(r, ESYS_STATE_INTERNALERROR, "Finish (Execute Async)"); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; return r; } @@ -272,12 +272,12 @@ Esys_ZGen_2Phase_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT && - esysContext->state != _ESYS_STATE_RESUBMISSION) { + if (esysContext->state != ESYS_STATE_SENT && + esysContext->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; /* Allocate memory for response parameters */ if (outZ1 != NULL) { @@ -297,7 +297,7 @@ Esys_ZGen_2Phase_Finish( r = Tss2_Sys_ExecuteFinish(esysContext->sys, esysContext->timeout); if (base_rc(r) == TSS2_BASE_RC_TRY_AGAIN) { LOG_DEBUG("A layer below returned TRY_AGAIN: %" PRIx32, r); - esysContext->state = _ESYS_STATE_SENT; + esysContext->state = ESYS_STATE_SENT; goto error_cleanup; } /* This block handle the resubmission of TPM commands given a certain set of @@ -305,12 +305,12 @@ Esys_ZGen_2Phase_Finish( 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); - if (esysContext->submissionCount++ >= _ESYS_MAX_SUBMISSIONS) { + if (esysContext->submissionCount++ >= ESYS_MAX_SUBMISSIONS) { LOG_WARNING("Maximum number of (re)submissions has been reached."); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } - esysContext->state = _ESYS_STATE_RESUBMISSION; + esysContext->state = ESYS_STATE_RESUBMISSION; r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); @@ -325,11 +325,11 @@ Esys_ZGen_2Phase_Finish( /* The following is the "regular error" handling. */ if (iesys_tpm_error(r)) { LOG_WARNING("Received TPM Error"); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; goto error_cleanup; } else if (r != TSS2_RC_SUCCESS) { LOG_ERROR("Received a non-TPM Error"); - esysContext->state = _ESYS_STATE_INTERNALERROR; + esysContext->state = ESYS_STATE_INTERNALERROR; goto error_cleanup; } @@ -338,7 +338,7 @@ Esys_ZGen_2Phase_Finish( * parameter decryption have to be done. */ r = iesys_check_response(esysContext); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Error: check response", + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Error: check response", error_cleanup); /* @@ -348,11 +348,11 @@ Esys_ZGen_2Phase_Finish( r = Tss2_Sys_ZGen_2Phase_Complete(esysContext->sys, (outZ1 != NULL) ? *outZ1 : NULL, (outZ2 != NULL) ? *outZ2 : NULL); - goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, + goto_state_if_error(r, ESYS_STATE_INTERNALERROR, "Received error from SAPI unmarshaling" , error_cleanup); - esysContext->state = _ESYS_STATE_INIT; + esysContext->state = ESYS_STATE_INIT; return TSS2_RC_SUCCESS; diff --git a/src/tss2-esys/esys_context.c b/src/tss2-esys/esys_context.c index c40c2e41f..df965476e 100644 --- a/src/tss2-esys/esys_context.c +++ b/src/tss2-esys/esys_context.c @@ -51,7 +51,7 @@ Esys_Initialize(ESYS_CONTEXT ** esys_context, TSS2_TCTI_CONTEXT * tcti, TSS2_RC r; size_t syssize; - _ESYS_ASSERT_NON_NULL(esys_context); + ESYS_ASSERT_NON_NULL(esys_context); *esys_context = NULL; /* Allocate memory for the ESYS context @@ -166,8 +166,8 @@ Esys_Finalize(ESYS_CONTEXT ** esys_context) TSS2_RC Esys_GetTcti(ESYS_CONTEXT * esys_context, TSS2_TCTI_CONTEXT ** tcti) { - _ESYS_ASSERT_NON_NULL(esys_context); - _ESYS_ASSERT_NON_NULL(tcti); + ESYS_ASSERT_NON_NULL(esys_context); + ESYS_ASSERT_NON_NULL(tcti); *tcti = esys_context->tcti_app_param; return TSS2_RC_SUCCESS; } @@ -191,9 +191,9 @@ Esys_GetPollHandles(ESYS_CONTEXT * esys_context, TSS2_RC r; TSS2_TCTI_CONTEXT *tcti_context; - _ESYS_ASSERT_NON_NULL(esys_context); - _ESYS_ASSERT_NON_NULL(handles); - _ESYS_ASSERT_NON_NULL(count); + ESYS_ASSERT_NON_NULL(esys_context); + ESYS_ASSERT_NON_NULL(handles); + ESYS_ASSERT_NON_NULL(count); /* Get the tcti-context to use */ r = Tss2_Sys_GetTctiContext(esys_context->sys, &tcti_context); @@ -223,7 +223,7 @@ Esys_GetPollHandles(ESYS_CONTEXT * esys_context, TSS2_RC Esys_SetTimeout(ESYS_CONTEXT * esys_context, int32_t timeout) { - _ESYS_ASSERT_NON_NULL(esys_context); + ESYS_ASSERT_NON_NULL(esys_context); esys_context->timeout = timeout; return TSS2_RC_SUCCESS; } diff --git a/src/tss2-esys/esys_crypto.c b/src/tss2-esys/esys_crypto.c index 9e7071cae..cfda38a3f 100644 --- a/src/tss2-esys/esys_crypto.c +++ b/src/tss2-esys/esys_crypto.c @@ -615,25 +615,28 @@ iesys_crypto_KDFa(ESYS_CRYPTO_CALLBACKS *crypto_cb, "IESYS KDFa contextV key"); BYTE *subKey = outKey; UINT32 counter = 0; - INT32 bytes = 0; + size_t bytes = 0; size_t hlen = 0; TSS2_RC r = iesys_crypto_hash_get_digest_size(hashAlg, &hlen); return_if_error(r, "Error"); if (counterInOut != NULL) counter = *counterInOut; bytes = use_digest_size ? hlen : (bitLength + 7) / 8; - LOG_DEBUG("IESYS KDFa hmac key bytes: %i", bytes); + LOG_DEBUG("IESYS KDFa hmac key bytes: %zu", bytes); /* Fill outKey with results from KDFaHmac */ - for (; bytes > 0; subKey = &subKey[hlen], bytes = bytes - hlen) { - LOG_TRACE("IESYS KDFa hmac key bytes: %i", bytes); - //if(bytes < (INT32)hlen) - // hlen = bytes; + for (;; subKey = &subKey[hlen], bytes = bytes - hlen) { + LOG_TRACE("IESYS KDFa hmac key bytes: %zu", bytes); counter++; r = iesys_crypto_KDFaHmac(crypto_cb, hashAlg, hmacKey, hmacKeySize, counter, label, contextU, contextV, bitLength, &subKey[0], &hlen); return_if_error(r, "Error"); + + if (bytes <= hlen) { + /* no bytes remaining */ + break; + } } if ((bitLength % 8) != 0) outKey[0] &= ((((BYTE)1) << (bitLength % 8)) - 1); @@ -669,7 +672,7 @@ iesys_crypto_KDFe(ESYS_CRYPTO_CALLBACKS *crypto_cb, { TSS2_RC r = TSS2_RC_SUCCESS; size_t hash_len; - INT16 byte_size = (INT16)((bit_size +7) / 8); + size_t byte_size = ((bit_size +7) / 8); BYTE *stream = key; ESYS_CRYPTO_CONTEXT_BLOB *cryptoContext; BYTE counter_buffer[4]; @@ -691,7 +694,7 @@ iesys_crypto_KDFe(ESYS_CRYPTO_CALLBACKS *crypto_cb, } /* Fill seed key with hash of counter, Z, label, partyUInfo, and partyVInfo */ - for (; byte_size > 0; stream = &stream[hash_len], byte_size = byte_size - hash_len) + for (;; stream = &stream[hash_len], byte_size = byte_size - hash_len) { counter ++; r = iesys_crypto_hash_start(crypto_cb, @@ -730,6 +733,11 @@ iesys_crypto_KDFe(ESYS_CRYPTO_CALLBACKS *crypto_cb, r = iesys_crypto_hash_finish(crypto_cb, &cryptoContext, (uint8_t *) stream, &hash_len); goto_if_error(r, "Error", error); + + if (byte_size <= hash_len) { + /* no bytes remaining */ + break; + } } LOGBLOB_DEBUG(key, bit_size/8, "Result KDFe"); if((bit_size % 8) != 0) @@ -801,8 +809,8 @@ iesys_xor_parameter_obfuscation(ESYS_CRYPTO_CALLBACKS *crypto_cb, } #define TEST_AND_SET_CALLBACK(crypto_cb, callbacks, fn) \ - if (callbacks->fn) { \ - crypto_cb->fn = callbacks->fn; \ + if ((callbacks)->fn) { \ + (crypto_cb)->fn = (callbacks)->fn; \ } else { \ LOG_ERROR("Callback \"%s\" not set", xstr(fn)); \ return TSS2_ESYS_RC_CALLBACK_NULL; \ @@ -820,22 +828,22 @@ TSS2_RC * userdata pointer it must be saved and restored. */ crypto_cb->userdata = NULL; - crypto_cb->aes_decrypt = _iesys_crypto_aes_decrypt; - crypto_cb->aes_encrypt = _iesys_crypto_aes_encrypt; - crypto_cb->sm4_decrypt = _iesys_crypto_sm4_decrypt; - crypto_cb->sm4_encrypt = _iesys_crypto_sm4_encrypt; - crypto_cb->get_ecdh_point = _iesys_crypto_get_ecdh_point; - crypto_cb->hash_abort = _iesys_crypto_hash_abort; - crypto_cb->hash_finish = _iesys_crypto_hash_finish; - crypto_cb->hash_start = _iesys_crypto_hash_start; - crypto_cb->hash_update = _iesys_crypto_hash_update; - crypto_cb->hmac_abort = _iesys_crypto_hmac_abort; - crypto_cb->hmac_finish = _iesys_crypto_hmac_finish; - crypto_cb->hmac_start = _iesys_crypto_hmac_start; - crypto_cb->hmac_update = _iesys_crypto_hmac_update; - crypto_cb->init = _iesys_crypto_init; - crypto_cb->get_random2b = _iesys_crypto_get_random2b; - crypto_cb->rsa_pk_encrypt = _iesys_crypto_rsa_pk_encrypt; + crypto_cb->aes_decrypt = iesys_crypto_aes_decrypt_internal; + crypto_cb->aes_encrypt = iesys_crypto_aes_encrypt_internal; + crypto_cb->sm4_decrypt = iesys_crypto_sm4_decrypt_internal; + crypto_cb->sm4_encrypt = iesys_crypto_sm4_encrypt_internal; + crypto_cb->get_ecdh_point = iesys_crypto_get_ecdh_point_internal; + crypto_cb->hash_abort = iesys_crypto_hash_abort_internal; + crypto_cb->hash_finish = iesys_crypto_hash_finish_internal; + crypto_cb->hash_start = iesys_crypto_hash_start_internal; + crypto_cb->hash_update = iesys_crypto_hash_update_internal; + crypto_cb->hmac_abort = iesys_crypto_hmac_abort_internal; + crypto_cb->hmac_finish = iesys_crypto_hmac_finish_internal; + crypto_cb->hmac_start = iesys_crypto_hmac_start_internal; + crypto_cb->hmac_update = iesys_crypto_hmac_update_internal; + crypto_cb->init = iesys_crypto_init_internal; + crypto_cb->get_random2b = iesys_crypto_get_random2b_internal; + crypto_cb->rsa_pk_encrypt = iesys_crypto_rsa_pk_encrypt_internal; } else { @@ -845,12 +853,12 @@ TSS2_RC if (user_cb->sm4_encrypt) { crypto_cb->sm4_encrypt = user_cb->sm4_encrypt; } else { - crypto_cb->sm4_encrypt = _iesys_crypto_sm4_encrypt; + crypto_cb->sm4_encrypt = iesys_crypto_sm4_encrypt_internal; } if (user_cb->sm4_decrypt) { crypto_cb->sm4_decrypt = user_cb->sm4_decrypt; } else { - crypto_cb->sm4_decrypt = _iesys_crypto_sm4_decrypt; + crypto_cb->sm4_decrypt = iesys_crypto_sm4_decrypt_internal; } TEST_AND_SET_CALLBACK(crypto_cb, user_cb, get_ecdh_point); TEST_AND_SET_CALLBACK(crypto_cb, user_cb, get_random2b); diff --git a/src/tss2-esys/esys_crypto.h b/src/tss2-esys/esys_crypto.h index c9041eb7d..4ef45c58c 100644 --- a/src/tss2-esys/esys_crypto.h +++ b/src/tss2-esys/esys_crypto.h @@ -22,22 +22,22 @@ #elif defined(MBED) #include "esys_crypto_mbed.h" #else -#define _iesys_crypto_aes_decrypt NULL; -#define _iesys_crypto_aes_encrypt NULL; -#define _iesys_crypto_sm4_decrypt NULL; -#define _iesys_crypto_sm4_encrypt NULL; -#define _iesys_crypto_get_ecdh_point NULL; -#define _iesys_crypto_hash_abort NULL; -#define _iesys_crypto_hash_finish NULL; -#define _iesys_crypto_hash_start NULL; -#define _iesys_crypto_hash_update NULL; -#define _iesys_crypto_hmac_abort NULL; -#define _iesys_crypto_hmac_finish NULL; -#define _iesys_crypto_hmac_start NULL; -#define _iesys_crypto_hmac_update NULL; -#define _iesys_crypto_init NULL; -#define _iesys_crypto_get_random2b NULL; -#define _iesys_crypto_rsa_pk_encrypt NULL; +#define iesys_crypto_aes_decrypt_internal NULL; +#define iesys_crypto_aes_encrypt_internal NULL; +#define iesys_crypto_sm4_decrypt_internal NULL; +#define iesys_crypto_sm4_encrypt_internal NULL; +#define iesys_crypto_get_ecdh_point_internal NULL; +#define iesys_crypto_hash_abort_internal NULL; +#define iesys_crypto_hash_finish_internal NULL; +#define iesys_crypto_hash_start_internal NULL; +#define iesys_crypto_hash_update_internal NULL; +#define iesys_crypto_hmac_abort_internal NULL; +#define iesys_crypto_hmac_finish_internal NULL; +#define iesys_crypto_hmac_start_internal NULL; +#define iesys_crypto_hmac_update_internal NULL; +#define iesys_crypto_init_internal NULL; +#define iesys_crypto_get_random2b_internal NULL; +#define iesys_crypto_rsa_pk_encrypt_internal NULL; #endif #ifdef __cplusplus diff --git a/src/tss2-esys/esys_crypto_mbed.h b/src/tss2-esys/esys_crypto_mbed.h index 40a976bb0..2c197767a 100644 --- a/src/tss2-esys/esys_crypto_mbed.h +++ b/src/tss2-esys/esys_crypto_mbed.h @@ -35,11 +35,11 @@ void iesys_cryptmbed_hash_abort( ESYS_CRYPTO_CONTEXT_BLOB **context, void *userdata); -#define _iesys_crypto_rsa_pk_encrypt iesys_cryptmbed_pk_encrypt -#define _iesys_crypto_hash_start iesys_cryptmbed_hash_start -#define _iesys_crypto_hash_update iesys_cryptmbed_hash_update -#define _iesys_crypto_hash_finish iesys_cryptmbed_hash_finish -#define _iesys_crypto_hash_abort iesys_cryptmbed_hash_abort +#define iesys_crypto_rsa_pk_encrypt_internal iesys_cryptmbed_pk_encrypt +#define iesys_crypto_hash_start_internal iesys_cryptmbed_hash_start +#define iesys_crypto_hash_update_internal iesys_cryptmbed_hash_update +#define iesys_crypto_hash_finish_internal iesys_cryptmbed_hash_finish +#define iesys_crypto_hash_abort_internal iesys_cryptmbed_hash_abort TSS2_RC iesys_cryptmbed_hmac_start( ESYS_CRYPTO_CONTEXT_BLOB **context, @@ -64,10 +64,10 @@ void iesys_cryptmbed_hmac_abort( ESYS_CRYPTO_CONTEXT_BLOB **context, void *userdata); -#define _iesys_crypto_hmac_start iesys_cryptmbed_hmac_start -#define _iesys_crypto_hmac_update iesys_cryptmbed_hmac_update -#define _iesys_crypto_hmac_finish iesys_cryptmbed_hmac_finish -#define _iesys_crypto_hmac_abort iesys_cryptmbed_hmac_abort +#define iesys_crypto_hmac_start_internal iesys_cryptmbed_hmac_start +#define iesys_crypto_hmac_update_internal iesys_cryptmbed_hmac_update +#define iesys_crypto_hmac_finish_internal iesys_cryptmbed_hmac_finish +#define iesys_crypto_hmac_abort_internal iesys_cryptmbed_hmac_abort TSS2_RC iesys_cryptmbed_random2b( TPM2B_NONCE *nonce, @@ -116,14 +116,14 @@ TSS2_RC iesys_cryptmbed_get_ecdh_point( TSS2_RC iesys_cryptmbed_init(void *userdata); -#define _iesys_crypto_get_random2b iesys_cryptmbed_random2b -#define _iesys_crypto_get_ecdh_point iesys_cryptmbed_get_ecdh_point -#define _iesys_crypto_aes_encrypt iesys_cryptmbed_sym_aes_encrypt -#define _iesys_crypto_aes_decrypt iesys_cryptmbed_sym_aes_decrypt -#define _iesys_crypto_sm4_encrypt NULL -#define _iesys_crypto_sm4_decrypt NULL +#define iesys_crypto_get_random2b_internal iesys_cryptmbed_random2b +#define iesys_crypto_get_ecdh_point_internal iesys_cryptmbed_get_ecdh_point +#define iesys_crypto_aes_encrypt_internal iesys_cryptmbed_sym_aes_encrypt +#define iesys_crypto_aes_decrypt_internal iesys_cryptmbed_sym_aes_decrypt +#define iesys_crypto_sm4_encrypt_internal NULL +#define iesys_crypto_sm4_decrypt_internal NULL -#define _iesys_crypto_init iesys_cryptmbed_init +#define iesys_crypto_init_internal iesys_cryptmbed_init #ifdef __cplusplus } /* extern "C" */ diff --git a/src/tss2-esys/esys_crypto_ossl.c b/src/tss2-esys/esys_crypto_ossl.c index 939d0aae9..15e534cec 100644 --- a/src/tss2-esys/esys_crypto_ossl.c +++ b/src/tss2-esys/esys_crypto_ossl.c @@ -752,7 +752,7 @@ iesys_cryptossl_pk_encrypt(TPM2B_PUBLIC * pub_tpm_key, "Could not duplicate OAEP label", cleanup); } - if (1 != EVP_PKEY_CTX_set0_rsa_oaep_label(ctx, label_copy, strlen(label_copy)+1)) { + if (1 != EVP_PKEY_CTX_set0_rsa_oaep_label(ctx, label_copy, (int) strlen(label_copy)+1)) { OPENSSL_free(label_copy); goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, "Could not set RSA label.", cleanup); @@ -989,12 +989,12 @@ iesys_cryptossl_get_ecdh_point(TPM2B_PUBLIC *key, } #endif - if (1 != iesys_bn2binpad(bn_x, &Q->x.buffer[0], key_size)) { + if (1 != iesys_bn2binpad(bn_x, &Q->x.buffer[0], (int) key_size)) { goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, "Write big num byte buffer", cleanup); } - if (1 != iesys_bn2binpad(bn_y, &Q->y.buffer[0], key_size)) { + if (1 != iesys_bn2binpad(bn_y, &Q->y.buffer[0], (int) key_size)) { goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, "Write big num byte buffer", cleanup); } @@ -1024,7 +1024,7 @@ iesys_cryptossl_get_ecdh_point(TPM2B_PUBLIC *key, "Get affine x coordinate", cleanup); } - if (1 != iesys_bn2binpad(bn_x, &Z->buffer[0], key_size)) { + if (1 != iesys_bn2binpad(bn_x, &Z->buffer[0], (int) key_size)) { goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, "Write big num byte buffer", cleanup); } @@ -1120,7 +1120,7 @@ iesys_cryptossl_sym_aes_encrypt(uint8_t * key, } /* Perform the encryption */ - if (1 != EVP_EncryptUpdate(ctx, buffer, &cipher_len, buffer, buffer_size)) { + if (1 != EVP_EncryptUpdate(ctx, buffer, &cipher_len, buffer, (int) buffer_size)) { goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, "Encrypt update", cleanup); } @@ -1203,7 +1203,7 @@ iesys_cryptossl_sym_aes_decrypt(uint8_t * key, } /* Perform the decryption */ - if (1 != EVP_DecryptUpdate(ctx, buffer, &cipher_len, buffer, buffer_size)) { + if (1 != EVP_DecryptUpdate(ctx, buffer, &cipher_len, buffer, (int) buffer_size)) { goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, "Encrypt update", cleanup); } @@ -1282,7 +1282,7 @@ iesys_cryptossl_sym_sm4_encrypt(uint8_t * key, } /* Perform the encryption */ - if (1 != EVP_EncryptUpdate(ctx, buffer, &cipher_len, buffer, buffer_size)) { + if (1 != EVP_EncryptUpdate(ctx, buffer, &cipher_len, buffer, (int) buffer_size)) { goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, "Encrypt update", cleanup); } @@ -1361,7 +1361,7 @@ iesys_cryptossl_sym_sm4_decrypt(uint8_t * key, } /* Perform the decryption */ - if (1 != EVP_DecryptUpdate(ctx, buffer, &cipher_len, buffer, buffer_size)) { + if (1 != EVP_DecryptUpdate(ctx, buffer, &cipher_len, buffer, (int) buffer_size)) { goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, "Encrypt update", cleanup); } diff --git a/src/tss2-esys/esys_crypto_ossl.h b/src/tss2-esys/esys_crypto_ossl.h index 6db843079..48bebf9e4 100644 --- a/src/tss2-esys/esys_crypto_ossl.h +++ b/src/tss2-esys/esys_crypto_ossl.h @@ -43,11 +43,11 @@ void iesys_cryptossl_hash_abort( ESYS_CRYPTO_CONTEXT_BLOB **context, void *userdata); -#define _iesys_crypto_rsa_pk_encrypt iesys_cryptossl_pk_encrypt -#define _iesys_crypto_hash_start iesys_cryptossl_hash_start -#define _iesys_crypto_hash_update iesys_cryptossl_hash_update -#define _iesys_crypto_hash_finish iesys_cryptossl_hash_finish -#define _iesys_crypto_hash_abort iesys_cryptossl_hash_abort +#define iesys_crypto_rsa_pk_encrypt_internal iesys_cryptossl_pk_encrypt +#define iesys_crypto_hash_start_internal iesys_cryptossl_hash_start +#define iesys_crypto_hash_update_internal iesys_cryptossl_hash_update +#define iesys_crypto_hash_finish_internal iesys_cryptossl_hash_finish +#define iesys_crypto_hash_abort_internal iesys_cryptossl_hash_abort TSS2_RC iesys_cryptossl_hmac_start( ESYS_CRYPTO_CONTEXT_BLOB **context, @@ -72,13 +72,13 @@ void iesys_cryptossl_hmac_abort( ESYS_CRYPTO_CONTEXT_BLOB **context, void *userdata); -#define _iesys_crypto_hmac_start iesys_cryptossl_hmac_start -#define _iesys_crypto_hmac_start2b iesys_cryptossl_hmac_start2b -#define _iesys_crypto_hmac_update iesys_cryptossl_hmac_update -#define _iesys_crypto_hmac_update2b iesys_cryptossl_hmac_update2b -#define _iesys_crypto_hmac_finish iesys_cryptossl_hmac_finish -#define _iesys_crypto_hmac_finish2b iesys_cryptossl_hmac_finish2b -#define _iesys_crypto_hmac_abort iesys_cryptossl_hmac_abort +#define iesys_crypto_hmac_start_internal iesys_cryptossl_hmac_start +#define iesys_crypto_hmac_start2b_internal iesys_cryptossl_hmac_start2b +#define iesys_crypto_hmac_update_internal iesys_cryptossl_hmac_update +#define iesys_crypto_hmac_update2b_internal iesys_cryptossl_hmac_update2b +#define iesys_crypto_hmac_finish_internal iesys_cryptossl_hmac_finish +#define iesys_crypto_hmac_finish2b_internal iesys_cryptossl_hmac_finish2b +#define iesys_crypto_hmac_abort_internal iesys_cryptossl_hmac_abort TSS2_RC iesys_cryptossl_random2b( TPM2B_NONCE *nonce, @@ -147,21 +147,21 @@ TSS2_RC iesys_cryptossl_get_ecdh_point( size_t * out_size, void *userdata); -#define _iesys_crypto_get_random2b iesys_cryptossl_random2b -#define _iesys_crypto_get_ecdh_point iesys_cryptossl_get_ecdh_point -#define _iesys_crypto_aes_encrypt iesys_cryptossl_sym_aes_encrypt -#define _iesys_crypto_aes_decrypt iesys_cryptossl_sym_aes_decrypt +#define iesys_crypto_get_random2b_internal iesys_cryptossl_random2b +#define iesys_crypto_get_ecdh_point_internal iesys_cryptossl_get_ecdh_point +#define iesys_crypto_aes_encrypt_internal iesys_cryptossl_sym_aes_encrypt +#define iesys_crypto_aes_decrypt_internal iesys_cryptossl_sym_aes_decrypt #if HAVE_EVP_SM4_CFB && !defined(OPENSSL_NO_SM4) -#define _iesys_crypto_sm4_encrypt iesys_cryptossl_sym_sm4_encrypt -#define _iesys_crypto_sm4_decrypt iesys_cryptossl_sym_sm4_decrypt +#define iesys_crypto_sm4_encrypt_internal iesys_cryptossl_sym_sm4_encrypt +#define iesys_crypto_sm4_decrypt_internal iesys_cryptossl_sym_sm4_decrypt #else -#define _iesys_crypto_sm4_encrypt NULL -#define _iesys_crypto_sm4_decrypt NULL +#define iesys_crypto_sm4_encrypt_internal NULL +#define iesys_crypto_sm4_decrypt_internal NULL #endif TSS2_RC iesys_cryptossl_init(void *userdata); -#define _iesys_crypto_init iesys_cryptossl_init +#define iesys_crypto_init_internal iesys_cryptossl_init #ifdef __cplusplus } /* extern "C" */ diff --git a/src/tss2-esys/esys_free.c b/src/tss2-esys/esys_free.c index 633413d96..a500979df 100644 --- a/src/tss2-esys/esys_free.c +++ b/src/tss2-esys/esys_free.c @@ -11,8 +11,8 @@ * of the C runtime to free memory that has been allocated by the * esys library on Windows. */ -void Esys_Free(void *__ptr) { - if (__ptr != NULL) { - free(__ptr); +void Esys_Free(void *ptr) { + if (ptr != NULL) { + free(ptr); } } diff --git a/src/tss2-esys/esys_int.h b/src/tss2-esys/esys_int.h index a1993dd13..469534822 100644 --- a/src/tss2-esys/esys_int.h +++ b/src/tss2-esys/esys_int.h @@ -147,15 +147,15 @@ typedef union { } IESYS_CMD_IN_PARAM; /** The states for the ESAPI's internal state machine */ -enum _ESYS_STATE { - _ESYS_STATE_INIT = 0, /**< The initial state after creation or after +enum ESYS_STATE { + ESYS_STATE_INIT = 0, /**< The initial state after creation or after finishing a command. A new command can only be issued in this state. */ - _ESYS_STATE_SENT, /**< The state after sending a command to the TPM + ESYS_STATE_SENT, /**< The state after sending a command to the TPM before receiving a response. */ - _ESYS_STATE_RESUBMISSION, /**< The state after receiving a response from the + ESYS_STATE_RESUBMISSION, /**< The state after receiving a response from the TPM that requires resending of the command.*/ - _ESYS_STATE_INTERNALERROR /**< A non-recoverable error occured within the + ESYS_STATE_INTERNALERROR /**< A non-recoverable error occured within the ESAPI code. */ }; @@ -166,7 +166,7 @@ enum _ESYS_STATE { * auths and similar things. */ struct ESYS_CONTEXT { - enum _ESYS_STATE state; /**< The current state of the ESAPI context. */ + enum ESYS_STATE state; /**< The current state of the ESAPI context. */ TSS2_SYS_CONTEXT *sys; /**< The SYS context used internally to talk to the TPM. */ ESYS_TR esys_handle_cnt; /**< The next free ESYS_TR number. */ @@ -211,12 +211,12 @@ struct ESYS_CONTEXT { * The number of resubmissions before a TPM's TPM2_RC_YIELDED is forwarded to * the application. */ -#define _ESYS_MAX_SUBMISSIONS 5 +#define ESYS_MAX_SUBMISSIONS 5 /** Makro testing parameters against null. */ -#define _ESYS_ASSERT_NON_NULL(x) \ - if (x == NULL) { \ +#define ESYS_ASSERT_NON_NULL(x) \ + if ((x) == NULL) { \ LOG_ERROR(str(x) " == NULL."); \ return TSS2_ESYS_RC_BAD_REFERENCE; \ } diff --git a/src/tss2-esys/esys_iutil.c b/src/tss2-esys/esys_iutil.c index 42b55c4bb..afad6e113 100644 --- a/src/tss2-esys/esys_iutil.c +++ b/src/tss2-esys/esys_iutil.c @@ -1053,7 +1053,7 @@ void iesys_compute_bound_entity(const TPM2B_NAME * name, const TPM2B_AUTH * auth, TPM2B_NAME * bound_entity) { - UINT16 i; + size_t i; UINT16 j = 0; *bound_entity = *name; memset(&bound_entity->name[bound_entity->size], 0, @@ -1234,7 +1234,7 @@ esys_GetResourceObject(ESYS_CONTEXT * esys_context, * * This function will check that the sequence of invocations to the esys context * was such that an _async function can be called. This means that the internal - * @state field is either @_ESYS_STATE_INIT, @_ESYS_STATE_ERRORRESPONSE, + * @state field is either @ESYS_STATE_INIT, @_ESYS_STATE_ERRORRESPONSE, * @_ESYS_STATE_FINISHED. * @param[in,out] esys_context The esys context to issue the command on. * @retval TSS2_RC_SUCCESS on success. @@ -1248,8 +1248,8 @@ iesys_check_sequence_async(ESYS_CONTEXT * esys_context) return TSS2_ESYS_RC_BAD_REFERENCE; } - if (esys_context->state != _ESYS_STATE_INIT && - esys_context->state != _ESYS_STATE_RESUBMISSION) { + if (esys_context->state != ESYS_STATE_INIT && + esys_context->state != ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } diff --git a/src/tss2-esys/esys_tr.c b/src/tss2-esys/esys_tr.c index 0c305c2b5..bfd8198b5 100644 --- a/src/tss2-esys/esys_tr.c +++ b/src/tss2-esys/esys_tr.c @@ -95,7 +95,7 @@ Esys_TR_Deserialize(ESYS_CONTEXT * esys_context, RSRC_NODE_T *esys_object; size_t offset = 0; - _ESYS_ASSERT_NON_NULL(esys_context); + ESYS_ASSERT_NON_NULL(esys_context); *esys_handle = esys_context->esys_handle_cnt++; r = esys_CreateResourceObject(esys_context, *esys_handle, &esys_object); return_if_error(r, "Get resource object"); @@ -139,7 +139,7 @@ Esys_TR_FromTPMPublic_Async(ESYS_CONTEXT * esys_context, ESYS_TR shandle2, ESYS_TR shandle3) { TSS2_RC r; - _ESYS_ASSERT_NON_NULL(esys_context); + ESYS_ASSERT_NON_NULL(esys_context); ESYS_TR esys_handle = esys_context->esys_handle_cnt++; RSRC_NODE_T *esysHandleNode = NULL; RSRC_NODE_T *node_rsrc = NULL; @@ -229,7 +229,7 @@ Esys_TR_FromTPMPublic_Finish(ESYS_CONTEXT * esys_context, ESYS_TR * object) RSRC_NODE_T *objectHandleNode; bool first_call; - _ESYS_ASSERT_NON_NULL(esys_context); + ESYS_ASSERT_NON_NULL(esys_context); objectHandle = esys_context->esys_handle; @@ -384,7 +384,7 @@ Esys_TR_FromTPMPublic(ESYS_CONTEXT * esys_context, { TSS2_RC r; - _ESYS_ASSERT_NON_NULL(esys_context); + ESYS_ASSERT_NON_NULL(esys_context); r = Esys_TR_FromTPMPublic_Async(esys_context, tpm_handle, shandle1, shandle2, shandle3); return_if_error(r, "Error TR FromTPMPublic"); @@ -432,7 +432,7 @@ Esys_TR_Close(ESYS_CONTEXT * esys_context, ESYS_TR * object) RSRC_NODE_T *node; RSRC_NODE_T **update_ptr; - _ESYS_ASSERT_NON_NULL(esys_context); + ESYS_ASSERT_NON_NULL(esys_context); for (node = esys_context->rsrc_list, update_ptr = &esys_context->rsrc_list; node != NULL; @@ -477,7 +477,7 @@ Esys_TR_SetAuth(ESYS_CONTEXT * esys_context, ESYS_TR esys_handle, TSS2_RC r; TPMI_ALG_HASH name_alg = TPM2_ALG_NULL; - _ESYS_ASSERT_NON_NULL(esys_context); + ESYS_ASSERT_NON_NULL(esys_context); if (esys_handle == ESYS_TR_NONE) { return_error(TSS2_ESYS_RC_BAD_TR, "esys_handle can't be ESYS_TR_NONE."); } @@ -534,7 +534,7 @@ Esys_TR_GetName(ESYS_CONTEXT * esys_context, ESYS_TR esys_handle, { RSRC_NODE_T *esys_object; TSS2_RC r; - _ESYS_ASSERT_NON_NULL(esys_context); + ESYS_ASSERT_NON_NULL(esys_context); if (esys_handle == ESYS_TR_NONE) { return_error(TSS2_ESYS_RC_BAD_TR, "Name for ESYS_TR_NONE can't be determined."); @@ -594,7 +594,7 @@ Esys_TRSess_GetAttributes(ESYS_CONTEXT * esys_context, ESYS_TR esys_handle, { RSRC_NODE_T *esys_object; - _ESYS_ASSERT_NON_NULL(esys_context); + ESYS_ASSERT_NON_NULL(esys_context); TSS2_RC r = esys_GetResourceObject(esys_context, esys_handle, &esys_object); return_if_error(r, "Object not found"); @@ -624,7 +624,7 @@ Esys_TRSess_SetAttributes(ESYS_CONTEXT * esys_context, ESYS_TR esys_handle, { RSRC_NODE_T *esys_object; - _ESYS_ASSERT_NON_NULL(esys_context); + ESYS_ASSERT_NON_NULL(esys_context); TSS2_RC r = esys_GetResourceObject(esys_context, esys_handle, &esys_object); return_if_error(r, "Object not found"); @@ -660,8 +660,8 @@ Esys_TRSess_GetNonceTPM(ESYS_CONTEXT * esys_context, ESYS_TR esys_handle, { RSRC_NODE_T *esys_object; TSS2_RC r; - _ESYS_ASSERT_NON_NULL(esys_context); - _ESYS_ASSERT_NON_NULL(nonceTPM); + ESYS_ASSERT_NON_NULL(esys_context); + ESYS_ASSERT_NON_NULL(nonceTPM); r = esys_GetResourceObject(esys_context, esys_handle, &esys_object); return_if_error(r, "Object not found"); @@ -709,8 +709,8 @@ Esys_TR_GetTpmHandle(ESYS_CONTEXT * esys_context, ESYS_TR esys_handle, TSS2_RC r = TSS2_RC_SUCCESS; RSRC_NODE_T *esys_object; - _ESYS_ASSERT_NON_NULL(esys_context); - _ESYS_ASSERT_NON_NULL(tpm_handle); + ESYS_ASSERT_NON_NULL(esys_context); + ESYS_ASSERT_NON_NULL(tpm_handle); if (esys_handle == ESYS_TR_NONE) { return TSS2_ESYS_RC_BAD_TR; @@ -743,7 +743,7 @@ Esys_TRSess_GetAuthRequired(ESYS_CONTEXT * esys_context, ESYS_TR esys_handle, { RSRC_NODE_T *esys_object; TSS2_RC r; - _ESYS_ASSERT_NON_NULL(esys_context); + ESYS_ASSERT_NON_NULL(esys_context); r = esys_GetResourceObject(esys_context, esys_handle, &esys_object); return_if_error(r, "Object not found"); diff --git a/src/tss2-fapi/api/Fapi_AuthorizePolicy.c b/src/tss2-fapi/api/Fapi_AuthorizePolicy.c index 85b3c49cb..2f94ba144 100644 --- a/src/tss2-fapi/api/Fapi_AuthorizePolicy.c +++ b/src/tss2-fapi/api/Fapi_AuthorizePolicy.c @@ -395,7 +395,7 @@ Fapi_AuthorizePolicy_Finish( ifapi_cleanup_ifapi_object(&context->loadKey.auth_object); SAFE_FREE(command->policyPath); SAFE_FREE(command->signingKeyPath); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_TRACE("finished"); return r; } diff --git a/src/tss2-fapi/api/Fapi_ChangeAuth.c b/src/tss2-fapi/api/Fapi_ChangeAuth.c index ca4a8c8db..253b81fbf 100644 --- a/src/tss2-fapi/api/Fapi_ChangeAuth.c +++ b/src/tss2-fapi/api/Fapi_ChangeAuth.c @@ -614,6 +614,6 @@ Fapi_ChangeAuth_Finish( SAFE_FREE(command->pathlist); } LOG_TRACE("finished"); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; return r; } diff --git a/src/tss2-fapi/api/Fapi_CreateKey.c b/src/tss2-fapi/api/Fapi_CreateKey.c index e13a1595d..a89892c84 100644 --- a/src/tss2-fapi/api/Fapi_CreateKey.c +++ b/src/tss2-fapi/api/Fapi_CreateKey.c @@ -292,7 +292,7 @@ Fapi_CreateKey_Finish( ifapi_cleanup_ifapi_object(&context->createPrimary.pkey_object); ifapi_cleanup_ifapi_object(context->loadKey.key_object); ifapi_cleanup_ifapi_object(&context->loadKey.auth_object); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_TRACE("finished"); return TSS2_RC_SUCCESS; @@ -301,7 +301,7 @@ Fapi_CreateKey_Finish( return_try_again(r); goto_if_error(r, "Key create", error_cleanup); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; return TSS2_RC_SUCCESS; statecasedefault(context->state); @@ -313,7 +313,7 @@ Fapi_CreateKey_Finish( ifapi_cleanup_ifapi_object(&context->createPrimary.pkey_object); ifapi_cleanup_ifapi_object(context->loadKey.key_object); ifapi_cleanup_ifapi_object(&context->loadKey.auth_object); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_TRACE("finished"); return r; } diff --git a/src/tss2-fapi/api/Fapi_CreateNv.c b/src/tss2-fapi/api/Fapi_CreateNv.c index 2a89ebe9e..8a1ab7fd0 100644 --- a/src/tss2-fapi/api/Fapi_CreateNv.c +++ b/src/tss2-fapi/api/Fapi_CreateNv.c @@ -484,7 +484,7 @@ Fapi_CreateNv_Finish( statecasedefault(context->state); } - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_DEBUG("success"); r = TSS2_RC_SUCCESS; diff --git a/src/tss2-fapi/api/Fapi_CreateSeal.c b/src/tss2-fapi/api/Fapi_CreateSeal.c index 1380c24e3..1cc9ca2eb 100644 --- a/src/tss2-fapi/api/Fapi_CreateSeal.c +++ b/src/tss2-fapi/api/Fapi_CreateSeal.c @@ -281,7 +281,7 @@ Fapi_CreateSeal_Finish( ifapi_cleanup_ifapi_object(&context->createPrimary.pkey_object); ifapi_cleanup_ifapi_object(context->loadKey.key_object); ifapi_cleanup_ifapi_object(&context->loadKey.auth_object); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_TRACE("finished"); return r; } diff --git a/src/tss2-fapi/api/Fapi_Decrypt.c b/src/tss2-fapi/api/Fapi_Decrypt.c index 77bf12e65..15dbbacd1 100644 --- a/src/tss2-fapi/api/Fapi_Decrypt.c +++ b/src/tss2-fapi/api/Fapi_Decrypt.c @@ -379,7 +379,7 @@ Fapi_Decrypt_Finish( statecasedefault(context->state); } - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; /* Cleanup of local objects */ SAFE_FREE(tpmPlainText); @@ -413,6 +413,6 @@ Fapi_Decrypt_Finish( ifapi_cleanup_ifapi_object(&context->createPrimary.pkey_object); ifapi_cleanup_ifapi_object(&context->loadKey.auth_object); ifapi_cleanup_ifapi_object(context->loadKey.key_object); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; return r; } diff --git a/src/tss2-fapi/api/Fapi_Delete.c b/src/tss2-fapi/api/Fapi_Delete.c index ac1d58467..6c369a396 100644 --- a/src/tss2-fapi/api/Fapi_Delete.c +++ b/src/tss2-fapi/api/Fapi_Delete.c @@ -752,7 +752,7 @@ Fapi_Delete_Finish( r = ifapi_cleanup_session(context); try_again_or_error_goto(r, "Cleanup", error_cleanup); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_DEBUG("success"); r = TSS2_RC_SUCCESS; @@ -796,6 +796,6 @@ Fapi_Delete_Finish( SAFE_FREE(command->pathlist); ifapi_session_clean(context); ifapi_cleanup_ifapi_object(&context->createPrimary.pkey_object); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; return r; } diff --git a/src/tss2-fapi/api/Fapi_Encrypt.c b/src/tss2-fapi/api/Fapi_Encrypt.c index 8301b53fd..3986aaa27 100644 --- a/src/tss2-fapi/api/Fapi_Encrypt.c +++ b/src/tss2-fapi/api/Fapi_Encrypt.c @@ -434,7 +434,7 @@ Fapi_Encrypt_Finish( statecasedefault(context->state); } - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; error_cleanup: /* Cleanup any intermediate results and state stored in the context. */ diff --git a/src/tss2-fapi/api/Fapi_ExportKey.c b/src/tss2-fapi/api/Fapi_ExportKey.c index 8be51ec75..7e87477ca 100644 --- a/src/tss2-fapi/api/Fapi_ExportKey.c +++ b/src/tss2-fapi/api/Fapi_ExportKey.c @@ -468,7 +468,7 @@ Fapi_ExportKey_Finish( if (r) SAFE_FREE(command->exportedData); context->duplicate_key = NULL; - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; ifapi_cleanup_ifapi_object(&parentKeyObject); ifapi_cleanup_ifapi_object(&commandObject); ifapi_session_clean(context); diff --git a/src/tss2-fapi/api/Fapi_ExportPolicy.c b/src/tss2-fapi/api/Fapi_ExportPolicy.c index 42144ad3f..2d4017ca3 100644 --- a/src/tss2-fapi/api/Fapi_ExportPolicy.c +++ b/src/tss2-fapi/api/Fapi_ExportPolicy.c @@ -334,7 +334,7 @@ Fapi_ExportPolicy_Finish( } /* Cleanup any intermediate results and state stored in the context. */ - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; if (jso) json_object_put(jso); ifapi_cleanup_ifapi_object(&command->object); @@ -357,6 +357,6 @@ Fapi_ExportPolicy_Finish( ifapi_cleanup_ifapi_object(context->loadKey.key_object); ifapi_cleanup_ifapi_object(&context->createPrimary.pkey_object); SAFE_FREE(command->path); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; return r; } diff --git a/src/tss2-fapi/api/Fapi_GetAppData.c b/src/tss2-fapi/api/Fapi_GetAppData.c index 6b5539875..699ad7646 100644 --- a/src/tss2-fapi/api/Fapi_GetAppData.c +++ b/src/tss2-fapi/api/Fapi_GetAppData.c @@ -229,7 +229,7 @@ Fapi_GetAppData_Finish( ifapi_cleanup_ifapi_object(&context->loadKey.auth_object); ifapi_cleanup_ifapi_object(context->loadKey.key_object); ifapi_cleanup_ifapi_object(&context->createPrimary.pkey_object); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_TRACE("finished"); return r; } diff --git a/src/tss2-fapi/api/Fapi_GetCertificate.c b/src/tss2-fapi/api/Fapi_GetCertificate.c index 0249bd04e..8c86104e8 100644 --- a/src/tss2-fapi/api/Fapi_GetCertificate.c +++ b/src/tss2-fapi/api/Fapi_GetCertificate.c @@ -132,7 +132,7 @@ Fapi_GetCertificate_Async( check_not_null(context); check_not_null(path); - if (context->state != _FAPI_STATE_INIT) { + if (context->state != FAPI_STATE_INIT) { return_error(TSS2_FAPI_RC_BAD_SEQUENCE, "Invalid State"); } @@ -210,7 +210,7 @@ Fapi_GetCertificate_Finish( r, error_cleanup); } - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; r = TSS2_RC_SUCCESS; break; diff --git a/src/tss2-fapi/api/Fapi_GetDescription.c b/src/tss2-fapi/api/Fapi_GetDescription.c index 146387439..0aeb00287 100644 --- a/src/tss2-fapi/api/Fapi_GetDescription.c +++ b/src/tss2-fapi/api/Fapi_GetDescription.c @@ -120,7 +120,7 @@ Fapi_GetDescription_Async( check_not_null(context); check_not_null(path); - if (context->state != _FAPI_STATE_INIT) { + if (context->state != FAPI_STATE_INIT) { return_error(TSS2_FAPI_RC_BAD_SEQUENCE, "Invalid State"); } @@ -181,7 +181,7 @@ Fapi_GetDescription_Finish( ifapi_cleanup_ifapi_object(&object); return_if_error_reset_state(r, "Get description"); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; r = TSS2_RC_SUCCESS; break; diff --git a/src/tss2-fapi/api/Fapi_GetEsysBlob.c b/src/tss2-fapi/api/Fapi_GetEsysBlob.c index dd396956e..ff8d3c379 100644 --- a/src/tss2-fapi/api/Fapi_GetEsysBlob.c +++ b/src/tss2-fapi/api/Fapi_GetEsysBlob.c @@ -295,7 +295,7 @@ Fapi_GetEsysBlob_Finish( r = Esys_TR_Serialize(context->esys, object->public.handle, data, length); goto_if_error(r, "Serialize object", error_cleanup); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_DEBUG("success"); r = TSS2_RC_SUCCESS; break; @@ -367,7 +367,7 @@ Fapi_GetEsysBlob_Finish( *data = command->data; *length = command->length; - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; break; statecasedefault(context->state); @@ -405,6 +405,6 @@ Fapi_GetEsysBlob_Finish( ifapi_cleanup_ifapi_object(&context->loadKey.auth_object); ifapi_cleanup_ifapi_object(context->loadKey.key_object); ifapi_cleanup_ifapi_object(&context->createPrimary.pkey_object); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; return r; } diff --git a/src/tss2-fapi/api/Fapi_GetInfo.c b/src/tss2-fapi/api/Fapi_GetInfo.c index 5eb63feb0..678c0c4b3 100644 --- a/src/tss2-fapi/api/Fapi_GetInfo.c +++ b/src/tss2-fapi/api/Fapi_GetInfo.c @@ -285,7 +285,7 @@ Fapi_GetInfo_Finish( #endif goto_if_null2(*info, "Out of memory.", r, TSS2_FAPI_RC_MEMORY, cleanup); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; r = TSS2_RC_SUCCESS; break; diff --git a/src/tss2-fapi/api/Fapi_GetPlatformCertificates.c b/src/tss2-fapi/api/Fapi_GetPlatformCertificates.c index fd9ba4280..2e660386b 100644 --- a/src/tss2-fapi/api/Fapi_GetPlatformCertificates.c +++ b/src/tss2-fapi/api/Fapi_GetPlatformCertificates.c @@ -264,13 +264,13 @@ Fapi_GetPlatformCertificates_Finish( /* Cleanup any intermediate results and state stored in the context. */ ifapi_free_node_list(cert_list); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_TRACE("finished"); return TSS2_RC_SUCCESS; error: /* Cleanup any intermediate results and state stored in the context. */ - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; NODE_OBJECT_T *cert = cert_list; while (cert) { SAFE_FREE(cert->object); diff --git a/src/tss2-fapi/api/Fapi_GetPollHandles.c b/src/tss2-fapi/api/Fapi_GetPollHandles.c index f36fc544b..936afca35 100644 --- a/src/tss2-fapi/api/Fapi_GetPollHandles.c +++ b/src/tss2-fapi/api/Fapi_GetPollHandles.c @@ -59,7 +59,7 @@ Fapi_GetPollHandles( check_not_null(num_handles); /* Check the correct state for poll handle retrieval. */ - if (context->state == _FAPI_STATE_INIT) { + if (context->state == FAPI_STATE_INIT) { LOG_ERROR("PollHandles can only be returned while an operation is running"); return TSS2_FAPI_RC_BAD_SEQUENCE; } diff --git a/src/tss2-fapi/api/Fapi_GetRandom.c b/src/tss2-fapi/api/Fapi_GetRandom.c index 31f3158cf..20580e799 100644 --- a/src/tss2-fapi/api/Fapi_GetRandom.c +++ b/src/tss2-fapi/api/Fapi_GetRandom.c @@ -263,7 +263,7 @@ Fapi_GetRandom_Finish( } /* Cleanup any intermediate results and state stored in the context. */ - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; ifapi_cleanup_ifapi_object(&context->createPrimary.pkey_object); ifapi_session_clean(context); LOG_TRACE("finished"); @@ -274,7 +274,7 @@ Fapi_GetRandom_Finish( ifapi_cleanup_ifapi_object(&context->createPrimary.pkey_object); ifapi_session_clean(context); SAFE_FREE(context->get_random.data); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_TRACE("finished"); return r; } diff --git a/src/tss2-fapi/api/Fapi_GetTpmBlobs.c b/src/tss2-fapi/api/Fapi_GetTpmBlobs.c index e797fcb4f..e52b2d4a0 100644 --- a/src/tss2-fapi/api/Fapi_GetTpmBlobs.c +++ b/src/tss2-fapi/api/Fapi_GetTpmBlobs.c @@ -141,7 +141,7 @@ Fapi_GetTpmBlobs_Async( check_not_null(context); check_not_null(path); - if (context->state != _FAPI_STATE_INIT) { + if (context->state != FAPI_STATE_INIT) { return_error(TSS2_FAPI_RC_BAD_SEQUENCE, "Invalid State"); } @@ -217,6 +217,7 @@ Fapi_GetTpmBlobs_Finish( /* Marshal the public data to the output parameter. */ if (tpm2bPublic && tpm2bPublicSize) { + // NOLINTNEXTLINE(bugprone-sizeof-expression) *tpm2bPublic = malloc(sizeof(uint8_t) * sizeof(TPM2B_PUBLIC)); goto_if_null(*tpm2bPublic, "Out of memory.", TSS2_FAPI_RC_MEMORY, error_cleanup); @@ -263,7 +264,7 @@ Fapi_GetTpmBlobs_Finish( /* Cleanup any intermediate results and state stored in the context. */ ifapi_cleanup_ifapi_object(&object); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_TRACE("finished"); return TSS2_RC_SUCCESS; @@ -278,6 +279,6 @@ Fapi_GetTpmBlobs_Finish( ifapi_cleanup_ifapi_object(context->loadKey.key_object); ifapi_cleanup_ifapi_object(&context->createPrimary.pkey_object); LOG_TRACE("finished"); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; return r; } diff --git a/src/tss2-fapi/api/Fapi_Import.c b/src/tss2-fapi/api/Fapi_Import.c index 4da9a9337..db7e286b7 100644 --- a/src/tss2-fapi/api/Fapi_Import.c +++ b/src/tss2-fapi/api/Fapi_Import.c @@ -177,7 +177,7 @@ Fapi_Import_Async( command->private = NULL; command->parent_path = NULL; - if (context->state != _FAPI_STATE_INIT) { + if (context->state != FAPI_STATE_INIT) { return_error(TSS2_FAPI_RC_BAD_SEQUENCE, "Invalid State"); } @@ -378,7 +378,7 @@ Fapi_Import_Async( cleanup_error: if (jso) json_object_put(jso); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; ifapi_cleanup_policy(&policy); ifapi_cleanup_ifapi_object(object); SAFE_FREE(command->jso_string); @@ -583,7 +583,7 @@ Fapi_Import_Finish( r = ifapi_cleanup_session(context); try_again_or_error_goto(r, "Cleanup", error_cleanup); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; break; statecase(context->state, IMPORT_KEY_WRITE_POLICY); @@ -591,7 +591,7 @@ Fapi_Import_Finish( return_try_again(r); return_if_error_reset_state(r, "write_finish failed"); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; break; statecase(context->state, IMPORT_KEY_WRITE); @@ -599,7 +599,7 @@ Fapi_Import_Finish( return_try_again(r); return_if_error_reset_state(r, "write_finish failed"); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; break; statecase(context->state, IMPORT_KEY_SEARCH); @@ -732,7 +732,7 @@ Fapi_Import_Finish( goto_if_error(r, "Set Timeout to non-blocking", error_cleanup); } - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; SAFE_FREE(command->out_path); /* Cleanup policy for key objects.*/ @@ -770,6 +770,6 @@ Fapi_Import_Finish( ifapi_cleanup_ifapi_object(&context->loadKey.auth_object); ifapi_cleanup_ifapi_object(context->loadKey.key_object); ifapi_cleanup_ifapi_object(&context->createPrimary.pkey_object); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; return r; } diff --git a/src/tss2-fapi/api/Fapi_Initialize.c b/src/tss2-fapi/api/Fapi_Initialize.c index 967c848ad..46d9dcde1 100644 --- a/src/tss2-fapi/api/Fapi_Initialize.c +++ b/src/tss2-fapi/api/Fapi_Initialize.c @@ -371,7 +371,7 @@ Fapi_Initialize_Finish( statecasedefault((*context)->state); } - (*context)->state = _FAPI_STATE_INIT; + (*context)->state = FAPI_STATE_INIT; SAFE_FREE(*capability); for (size_t i = 0; i < command->numPaths; i++) { SAFE_FREE(command->pathlist[i]); diff --git a/src/tss2-fapi/api/Fapi_NvExtend.c b/src/tss2-fapi/api/Fapi_NvExtend.c index 5ff16c1fb..3a5ae9b9f 100644 --- a/src/tss2-fapi/api/Fapi_NvExtend.c +++ b/src/tss2-fapi/api/Fapi_NvExtend.c @@ -499,6 +499,6 @@ Fapi_NvExtend_Finish( SAFE_FREE(object->misc.nv.event_log); ifapi_session_clean(context); LOG_TRACE("finished"); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; return r; } diff --git a/src/tss2-fapi/api/Fapi_NvIncrement.c b/src/tss2-fapi/api/Fapi_NvIncrement.c index 18c15db79..6cca37c31 100644 --- a/src/tss2-fapi/api/Fapi_NvIncrement.c +++ b/src/tss2-fapi/api/Fapi_NvIncrement.c @@ -358,7 +358,7 @@ Fapi_NvIncrement_Finish( SAFE_FREE(command->nvPath); SAFE_FREE(jso); ifapi_session_clean(context); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_TRACE("finished"); return r; } diff --git a/src/tss2-fapi/api/Fapi_NvRead.c b/src/tss2-fapi/api/Fapi_NvRead.c index 1a1cb0ad3..58b6ec959 100644 --- a/src/tss2-fapi/api/Fapi_NvRead.c +++ b/src/tss2-fapi/api/Fapi_NvRead.c @@ -355,7 +355,7 @@ Fapi_NvRead_Finish( SAFE_FREE(command->nvPath); //SAFE_FREE(context->nv_cmd.tes); ifapi_session_clean(context); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_TRACE("finished"); return r; } diff --git a/src/tss2-fapi/api/Fapi_NvSetBits.c b/src/tss2-fapi/api/Fapi_NvSetBits.c index 7038a6722..e13ed1a18 100644 --- a/src/tss2-fapi/api/Fapi_NvSetBits.c +++ b/src/tss2-fapi/api/Fapi_NvSetBits.c @@ -369,7 +369,7 @@ Fapi_NvSetBits_Finish( ifapi_cleanup_ifapi_object(&context->loadKey.auth_object); ifapi_cleanup_ifapi_object(context->loadKey.key_object); ifapi_cleanup_ifapi_object(&context->createPrimary.pkey_object); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_TRACE("finished"); return r; } diff --git a/src/tss2-fapi/api/Fapi_NvWrite.c b/src/tss2-fapi/api/Fapi_NvWrite.c index 149cbd4d9..77236428e 100644 --- a/src/tss2-fapi/api/Fapi_NvWrite.c +++ b/src/tss2-fapi/api/Fapi_NvWrite.c @@ -310,7 +310,7 @@ Fapi_NvWrite_Finish( SAFE_FREE(command->data); SAFE_FREE(jso); ifapi_session_clean(context); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_TRACE("finished"); return r; } diff --git a/src/tss2-fapi/api/Fapi_PcrExtend.c b/src/tss2-fapi/api/Fapi_PcrExtend.c index 9b06743c8..ef5994bd9 100644 --- a/src/tss2-fapi/api/Fapi_PcrExtend.c +++ b/src/tss2-fapi/api/Fapi_PcrExtend.c @@ -362,7 +362,7 @@ Fapi_PcrExtend_Finish( ifapi_cleanup_ifapi_object(&context->createPrimary.pkey_object); ifapi_cleanup_event(pcrEvent); ifapi_session_clean(context); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_TRACE("finished"); return r; } diff --git a/src/tss2-fapi/api/Fapi_PcrRead.c b/src/tss2-fapi/api/Fapi_PcrRead.c index b1a2af9cf..1aa64234c 100644 --- a/src/tss2-fapi/api/Fapi_PcrRead.c +++ b/src/tss2-fapi/api/Fapi_PcrRead.c @@ -259,7 +259,7 @@ Fapi_PcrRead_Finish( *pcrValue = command->pcrValue; if (pcrValueSize) *pcrValueSize = command->pcrValueSize; - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; break; } @@ -291,7 +291,7 @@ Fapi_PcrRead_Finish( SAFE_FREE(command->pcrValue); } SAFE_FREE(command->pcrValues); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_TRACE("finished"); return r; } diff --git a/src/tss2-fapi/api/Fapi_Provision.c b/src/tss2-fapi/api/Fapi_Provision.c index ddb39fec1..a7f265383 100644 --- a/src/tss2-fapi/api/Fapi_Provision.c +++ b/src/tss2-fapi/api/Fapi_Provision.c @@ -1541,7 +1541,7 @@ Fapi_Provision_Finish(FAPI_CONTEXT *context) r = ifapi_cleanup_session(context); try_again_or_error_goto(r, "Cleanup", error_cleanup); - context->state =_FAPI_STATE_INIT; + context->state =FAPI_STATE_INIT; break; statecase(context->state, PROVISION_WRITE_HIERARCHIES); @@ -1676,7 +1676,7 @@ Fapi_Provision_Finish(FAPI_CONTEXT *context) } SAFE_FREE(command->pathlist); } - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_TRACE("finished"); return r; } diff --git a/src/tss2-fapi/api/Fapi_Quote.c b/src/tss2-fapi/api/Fapi_Quote.c index d55329e3a..78026423d 100644 --- a/src/tss2-fapi/api/Fapi_Quote.c +++ b/src/tss2-fapi/api/Fapi_Quote.c @@ -500,7 +500,7 @@ Fapi_Quote_Finish( if (command->handle != ESYS_TR_NONE) { Esys_FlushContext(context->esys, command->handle); } - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_TRACE("finished"); return r; } diff --git a/src/tss2-fapi/api/Fapi_SetAppData.c b/src/tss2-fapi/api/Fapi_SetAppData.c index 7a20bc66d..3664408ce 100644 --- a/src/tss2-fapi/api/Fapi_SetAppData.c +++ b/src/tss2-fapi/api/Fapi_SetAppData.c @@ -24,7 +24,7 @@ #define LOGMODULE fapi #include "util/log.h" // for LOG_TRACE, SAFE_FREE, return_error, LOGB... -#define FAPI_MAX_APP_DATA_SIZE 10*1024*1024 +#define FAPI_MAX_APP_DATA_SIZE (10*1024*1024) /** One-Call function for Fapi_SetAppData * @@ -144,7 +144,7 @@ Fapi_SetAppData_Async( /* Cleanup command context. */ memset(&context->cmd, 0, sizeof(IFAPI_CMD_STATE)); - if (context->state != _FAPI_STATE_INIT) { + if (context->state != FAPI_STATE_INIT) { return_error(TSS2_FAPI_RC_BAD_SEQUENCE, "Invalid State"); } @@ -289,7 +289,7 @@ Fapi_SetAppData_Finish( ifapi_cleanup_ifapi_object(context->loadKey.key_object); ifapi_cleanup_ifapi_object(&context->createPrimary.pkey_object); SAFE_FREE(command->object_path); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_TRACE("finished"); return r; } diff --git a/src/tss2-fapi/api/Fapi_SetCertificate.c b/src/tss2-fapi/api/Fapi_SetCertificate.c index 38cf52596..aee209f35 100644 --- a/src/tss2-fapi/api/Fapi_SetCertificate.c +++ b/src/tss2-fapi/api/Fapi_SetCertificate.c @@ -139,7 +139,7 @@ Fapi_SetCertificate_Async( /* Cleanup command context. */ memset(&context->cmd, 0, sizeof(IFAPI_CMD_STATE)); - if (context->state != _FAPI_STATE_INIT) { + if (context->state != FAPI_STATE_INIT) { return_error(TSS2_FAPI_RC_BAD_SEQUENCE, "Invalid State"); } @@ -273,7 +273,7 @@ Fapi_SetCertificate_Finish( ifapi_cleanup_ifapi_object(&context->loadKey.auth_object); ifapi_cleanup_ifapi_object(context->loadKey.key_object); ifapi_cleanup_ifapi_object(&context->createPrimary.pkey_object); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_TRACE("finished"); return r; } diff --git a/src/tss2-fapi/api/Fapi_SetDescription.c b/src/tss2-fapi/api/Fapi_SetDescription.c index 692d1888a..d54124811 100644 --- a/src/tss2-fapi/api/Fapi_SetDescription.c +++ b/src/tss2-fapi/api/Fapi_SetDescription.c @@ -130,7 +130,7 @@ Fapi_SetDescription_Async( /* Cleanup command context. */ memset(&context->cmd, 0, sizeof(IFAPI_CMD_STATE)); - if (context->state != _FAPI_STATE_INIT) { + if (context->state != FAPI_STATE_INIT) { return_error(TSS2_FAPI_RC_BAD_SEQUENCE, "Invalid State"); } @@ -245,7 +245,7 @@ Fapi_SetDescription_Finish( ifapi_cleanup_ifapi_object(context->loadKey.key_object); ifapi_cleanup_ifapi_object(&context->createPrimary.pkey_object); SAFE_FREE(command->object_path); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_TRACE("finished"); return r; } diff --git a/src/tss2-fapi/api/Fapi_Sign.c b/src/tss2-fapi/api/Fapi_Sign.c index ad202cc56..dc961edd3 100644 --- a/src/tss2-fapi/api/Fapi_Sign.c +++ b/src/tss2-fapi/api/Fapi_Sign.c @@ -326,7 +326,7 @@ Fapi_Sign_Finish( if (publicKey) *publicKey = command->publicKey; *signature = command->ret_signature; - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; break; statecasedefault(context->state); @@ -342,7 +342,7 @@ Fapi_Sign_Finish( SAFE_FREE(command->padding); ifapi_session_clean(context); ifapi_cleanup_ifapi_object(&context->createPrimary.pkey_object); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_TRACE("finished"); return r; } diff --git a/src/tss2-fapi/api/Fapi_Unseal.c b/src/tss2-fapi/api/Fapi_Unseal.c index be32996d7..fd81e63df 100644 --- a/src/tss2-fapi/api/Fapi_Unseal.c +++ b/src/tss2-fapi/api/Fapi_Unseal.c @@ -311,7 +311,7 @@ Fapi_Unseal_Finish( ifapi_cleanup_ifapi_object(&context->createPrimary.pkey_object); ifapi_session_clean(context); SAFE_FREE(command->keyPath); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_TRACE("finished"); return r; } diff --git a/src/tss2-fapi/api/Fapi_VerifyQuote.c b/src/tss2-fapi/api/Fapi_VerifyQuote.c index 19ab4d1f5..89d25bd98 100644 --- a/src/tss2-fapi/api/Fapi_VerifyQuote.c +++ b/src/tss2-fapi/api/Fapi_VerifyQuote.c @@ -183,7 +183,7 @@ Fapi_VerifyQuote_Async( /* Cleanup command context. */ memset(&context->cmd, 0, sizeof(IFAPI_CMD_STATE)); - if (context->state != _FAPI_STATE_INIT) { + if (context->state != FAPI_STATE_INIT) { return_error(TSS2_FAPI_RC_BAD_SEQUENCE, "Invalid State"); } @@ -313,14 +313,14 @@ Fapi_VerifyQuote_Finish( memcmp(&command->qualifyingData.buffer[0], &command->fapi_quote_info.attest.extraData.buffer[0], command->qualifyingData.size) != 0) { - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; goto_error(r, TSS2_FAPI_RC_SIGNATURE_VERIFICATION_FAILED, "Invalid qualifying data for quote", error_cleanup); } /* If no logData was provided then the operation is done. */ if (!command->logData) { - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; break; } @@ -357,7 +357,7 @@ Fapi_VerifyQuote_Finish( SAFE_FREE(command->signature); SAFE_FREE(command->quoteInfo); SAFE_FREE(command->logData); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_TRACE("finished"); return r; } diff --git a/src/tss2-fapi/api/Fapi_WriteAuthorizeNV.c b/src/tss2-fapi/api/Fapi_WriteAuthorizeNV.c index 1dac691d3..4c9918d6a 100644 --- a/src/tss2-fapi/api/Fapi_WriteAuthorizeNV.c +++ b/src/tss2-fapi/api/Fapi_WriteAuthorizeNV.c @@ -361,7 +361,7 @@ Fapi_WriteAuthorizeNv_Finish( ifapi_cleanup_ifapi_object(context->loadKey.key_object); ifapi_cleanup_ifapi_object(&context->createPrimary.pkey_object); ifapi_cleanup_ifapi_object(object); - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; LOG_TRACE("finished"); return r; } diff --git a/src/tss2-fapi/efi_event.h b/src/tss2-fapi/efi_event.h index b28f0f9d3..ba3a3009d 100644 --- a/src/tss2-fapi/efi_event.h +++ b/src/tss2-fapi/efi_event.h @@ -34,17 +34,17 @@ /* TCG EFI Platform Specification For TPM Family 1.1 or 1.2 */ #define EV_EFI_EVENT_BASE 0x80000000 -#define EV_EFI_VARIABLE_DRIVER_CONFIG EV_EFI_EVENT_BASE + 0x1 -#define EV_EFI_VARIABLE_BOOT EV_EFI_EVENT_BASE + 0x2 -#define EV_EFI_BOOT_SERVICES_APPLICATION EV_EFI_EVENT_BASE + 0x3 -#define EV_EFI_BOOT_SERVICES_DRIVER EV_EFI_EVENT_BASE + 0x4 -#define EV_EFI_RUNTIME_SERVICES_DRIVER EV_EFI_EVENT_BASE + 0x5 -#define EV_EFI_GPT_EVENT EV_EFI_EVENT_BASE + 0x6 -#define EV_EFI_ACTION EV_EFI_EVENT_BASE + 0x7 -#define EV_EFI_PLATFORM_FIRMWARE_BLOB EV_EFI_EVENT_BASE + 0x8 -#define EV_EFI_HANDOFF_TABLES EV_EFI_EVENT_BASE + 0x9 -#define EV_EFI_HCRTM_EVENT EV_EFI_EVENT_BASE + 0x10 -#define EV_EFI_VARIABLE_AUTHORITY EV_EFI_EVENT_BASE + 0xe0 +#define EV_EFI_VARIABLE_DRIVER_CONFIG (EV_EFI_EVENT_BASE + 0x1) +#define EV_EFI_VARIABLE_BOOT (EV_EFI_EVENT_BASE + 0x2) +#define EV_EFI_BOOT_SERVICES_APPLICATION (EV_EFI_EVENT_BASE + 0x3) +#define EV_EFI_BOOT_SERVICES_DRIVER (EV_EFI_EVENT_BASE + 0x4) +#define EV_EFI_RUNTIME_SERVICES_DRIVER (EV_EFI_EVENT_BASE + 0x5) +#define EV_EFI_GPT_EVENT (EV_EFI_EVENT_BASE + 0x6) +#define EV_EFI_ACTION (EV_EFI_EVENT_BASE + 0x7) +#define EV_EFI_PLATFORM_FIRMWARE_BLOB (EV_EFI_EVENT_BASE + 0x8) +#define EV_EFI_HANDOFF_TABLES (EV_EFI_EVENT_BASE + 0x9) +#define EV_EFI_HCRTM_EVENT (EV_EFI_EVENT_BASE + 0x10) +#define EV_EFI_VARIABLE_AUTHORITY (EV_EFI_EVENT_BASE + 0xe0) #ifndef PACKED #define PACKED __attribute__((__packed__)) diff --git a/src/tss2-fapi/fapi_crypto.c b/src/tss2-fapi/fapi_crypto.c index d7ddc58e6..eab576ac0 100644 --- a/src/tss2-fapi/fapi_crypto.c +++ b/src/tss2-fapi/fapi_crypto.c @@ -57,7 +57,7 @@ #endif /* OPENSSL_VERSION_NUMBER >= 0x10101000L */ /** Context to hold temporary values for ifapi_crypto */ -typedef struct _IFAPI_CRYPTO_CONTEXT { +typedef struct IFAPI_CRYPTO_CONTEXT { #if OPENSSL_VERSION_NUMBER < 0x30000000L /** The currently used hash algorithm */ const EVP_MD *osslHashAlgorithm; @@ -752,7 +752,7 @@ ifapi_ecc_der_sig_to_tpm( const BIGNUM *bnr; const BIGNUM *bns; - d2i_ECDSA_SIG(&ecdsaSignature, &signature, signatureSize); + d2i_ECDSA_SIG(&ecdsaSignature, &signature, (long) signatureSize); return_if_null(ecdsaSignature, "Invalid DER signature", TSS2_FAPI_RC_GENERAL_FAILURE); @@ -1188,12 +1188,12 @@ get_ecc_tpm2b_public_from_evp( tpmPublic->publicArea.unique.ecc.x.size = ecKeySize; tpmPublic->publicArea.unique.ecc.y.size = ecKeySize; if (1 != ifapi_bn2binpad(bnX, &tpmPublic->publicArea.unique.ecc.x.buffer[0], - ecKeySize)) { + (int) ecKeySize)) { goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "Write big num byte buffer", cleanup); } if (1 != ifapi_bn2binpad(bnY, &tpmPublic->publicArea.unique.ecc.y.buffer[0], - ecKeySize)) { + (int) ecKeySize)) { goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "Write big num byte buffer", cleanup); } @@ -1253,7 +1253,7 @@ ifapi_get_evp_from_pem(const char *pemKey, EVP_PKEY **publicKey) { BIO *bufio = NULL; /* Use BIO for conversion */ - bufio = BIO_new_mem_buf((void *)pemKey, strlen(pemKey)); + bufio = BIO_new_mem_buf((void *)pemKey, (int) strlen(pemKey)); goto_if_null(bufio, "BIO buffer could not be allocated.", TSS2_FAPI_RC_MEMORY, cleanup); @@ -1418,7 +1418,7 @@ ifapi_verify_signature_quote( /* Create an OpenSSL object for the key */ bufio = BIO_new_mem_buf((void *)public_pem_key, - strlen(public_pem_key)); + (int) strlen(public_pem_key)); goto_if_null(bufio, "BIO buffer could not be allocated.", TSS2_FAPI_RC_MEMORY, error_cleanup); @@ -1549,7 +1549,7 @@ ifapi_verify_signature( /* Convert the key to an OpenSSL object */ bufio = BIO_new_mem_buf((void *)public_pem_key, - strlen(public_pem_key)); + (int) strlen(public_pem_key)); goto_if_null(bufio, "Out of memory.", TSS2_FAPI_RC_MEMORY, error_cleanup); publicKey = PEM_read_bio_PUBKEY(bufio, NULL, NULL, NULL); goto_if_null(publicKey, "PEM format could not be decoded.", @@ -1823,7 +1823,7 @@ ifapi_cert_to_pem( EVP_PKEY *publicKey = NULL; int pemCertSize; - if (!d2i_X509(&cert, (const unsigned char **)&certBuffer, certBufferSize)) { + if (!d2i_X509(&cert, (const unsigned char **)&certBuffer, (long) certBufferSize)) { LOGBLOB_ERROR(certBuffer, certBufferSize, "Bad certificate data"); return_error(TSS2_FAPI_RC_GENERAL_FAILURE, "Invalid certificate."); } @@ -1939,7 +1939,7 @@ static X509 /* Use BIO for conversion */ size_t pem_length = strlen(pem_cert); - bufio = BIO_new_mem_buf((void *)pem_cert, pem_length); + bufio = BIO_new_mem_buf((void *)pem_cert, (int) pem_length); if (!bufio) return NULL; /* Convert the certificate */ @@ -2096,7 +2096,7 @@ ifapi_base64encode(uint8_t *buffer, size_t buffer_size, char** b64_data) { bio = BIO_push(bio64, bio); BIO_set_flags(bio, BIO_FLAGS_BASE64_NO_NL); - bytes_written = BIO_write(bio, buffer, buffer_size); + bytes_written = BIO_write(bio, buffer, (int) buffer_size); if (bytes_written != (int)buffer_size) { goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "Invalid BIO_write", cleanup); @@ -2149,7 +2149,7 @@ ifapi_rsa_encrypt(const char *pem_key, const EVP_MD *evp_md; /* Convert the pem key to an OpenSSL object */ - bufio = BIO_new_mem_buf((void *)pem_key, strlen(pem_key)); + bufio = BIO_new_mem_buf((void *)pem_key, (int) strlen(pem_key)); goto_if_null(bufio, "Out of memory.", TSS2_FAPI_RC_MEMORY, cleanup); publicKey = PEM_read_bio_PUBKEY(bufio, NULL, NULL, NULL); @@ -2332,7 +2332,7 @@ load_private_ECC_from_key(EVP_PKEY *key, goto out; } - p->size = BN_bn2binpad(b, p->buffer, priv_bytes); + p->size = BN_bn2binpad(b, p->buffer, (int) priv_bytes); if (p->size != priv_bytes) { goto out; } diff --git a/src/tss2-fapi/fapi_crypto.h b/src/tss2-fapi/fapi_crypto.h index b88162451..3c714c30f 100644 --- a/src/tss2-fapi/fapi_crypto.h +++ b/src/tss2-fapi/fapi_crypto.h @@ -58,7 +58,7 @@ ifapi_verify_signature_quote( const TPMT_SIG_SCHEME *signatureScheme); -typedef struct _IFAPI_CRYPTO_CONTEXT IFAPI_CRYPTO_CONTEXT_BLOB; +typedef struct IFAPI_CRYPTO_CONTEXT IFAPI_CRYPTO_CONTEXT_BLOB; TSS2_RC ifapi_crypto_hash_start( diff --git a/src/tss2-fapi/fapi_int.h b/src/tss2-fapi/fapi_int.h index 163ad6934..b6c26e9e7 100644 --- a/src/tss2-fapi/fapi_int.h +++ b/src/tss2-fapi/fapi_int.h @@ -91,27 +91,27 @@ typedef struct { #define FAPI_COPY_DIGEST(dest_buffer, dest_size, src, src_size) \ - if (src_size > sizeof(TPMU_HA)) { \ + if ((src_size) > sizeof(TPMU_HA)) { \ return_error(TSS2_FAPI_RC_BAD_VALUE, "Digest size too large."); \ } \ memcpy(dest_buffer, (src), (src_size)); \ - dest_size = src_size + (dest_size) = src_size #define HASH_UPDATE(CONTEXT, TYPE, OBJECT, R, LABEL) \ { \ uint8_t buffer[sizeof(TYPE)]; \ size_t offset = 0; \ - R = Tss2_MU_ ## TYPE ## _Marshal(OBJECT, \ + (R) = Tss2_MU_ ## TYPE ## _Marshal(OBJECT, \ &buffer[0], sizeof(TYPE), &offset); \ goto_if_error(R, "Marshal for hash update", LABEL); \ - R = ifapi_crypto_hash_update(CONTEXT, \ + (R) = ifapi_crypto_hash_update(CONTEXT, \ (const uint8_t *) &buffer[0], \ offset); \ goto_if_error(R, "crypto hash update", LABEL); } #define HASH_UPDATE_BUFFER(CONTEXT, BUFFER, SIZE, R, LABEL) \ R = ifapi_crypto_hash_update(CONTEXT, \ - (const uint8_t *) BUFFER, SIZE) ; \ + (const uint8_t *) (BUFFER), SIZE) ; \ goto_if_error(R, "crypto hash update", LABEL); #define FAPI_SYNC(r,msg,label, ...) \ @@ -123,8 +123,8 @@ typedef struct { } #define ENC_SESSION_IF_POLICY(auth_session) \ - (auth_session == ESYS_TR_PASSWORD || auth_session == ESYS_TR_NONE || \ - auth_session == context->session2 || \ + ((auth_session) == ESYS_TR_PASSWORD || (auth_session) == ESYS_TR_NONE || \ + (auth_session) == context->session2 || \ !context->session2) ? ESYS_TR_NONE : context->session2 /** The states for the FAPI's object authorization state*/ @@ -188,7 +188,7 @@ typedef struct { /** The states for the FAPI's NV read state */ -enum _FAPI_STATE_NV_READ { +enum FAPI_STATE_NV_READ { NV_READ_INIT = 0, NV_READ_AUTHORIZE, NV_READ_AUTHORIZE2, @@ -200,7 +200,7 @@ enum _FAPI_STATE_NV_READ { }; /** The states for the FAPI's NV write state */ -enum _FAPI_STATE_NV_WRITE { +enum FAPI_STATE_NV_WRITE { NV2_WRITE_INIT = 0, NV2_WRITE_READ, NV2_WRITE_WAIT_FOR_SESSSION, @@ -237,8 +237,8 @@ typedef struct { uint64_t bitmap; /**< The bitmask for the SetBits command */ IFAPI_NV_TEMPLATE public_templ; /**< The template for nv creation, adjusted appropriate by the passed flags */ - enum _FAPI_STATE_NV_READ nv_read_state; /**< The current state of NV read */ - enum _FAPI_STATE_NV_WRITE nv_write_state; /**< The current state of NV write*/ + enum FAPI_STATE_NV_READ nv_read_state; /**< The current state of NV read */ + enum FAPI_STATE_NV_WRITE nv_write_state; /**< The current state of NV write*/ uint8_t *write_data; char *logData; /**< The event log for NV objects of type pcr */ json_object *jso_event_log; /**< logData in JSON format */ @@ -649,7 +649,7 @@ typedef struct { } IFAPI_FILE_SEARCH_CTX; /** The states for the FAPI's prepare key loading */ -enum _FAPI_STATE_PREPARE_LOAD_KEY { +enum FAPI_STATE_PREPARE_LOAD_KEY { PREPARE_LOAD_KEY_INIT = 0, PREPARE_LOAD_KEY_WAIT_FOR_SESSION, PREPARE_LOAD_KEY_INIT_KEY, @@ -657,7 +657,7 @@ enum _FAPI_STATE_PREPARE_LOAD_KEY { }; /** The states for the FAPI's key loading */ -enum _FAPI_STATE_LOAD_KEY { +enum FAPI_STATE_LOAD_KEY { LOAD_KEY_GET_PATH = 0, LOAD_KEY_READ_KEY, LOAD_KEY_WAIT_FOR_PRIMARY, @@ -716,8 +716,8 @@ typedef struct { /** The data structure holding internal state of loading keys. */ typedef struct { - enum _FAPI_STATE_LOAD_KEY state; /**< The current state of key loading */ - enum _FAPI_STATE_PREPARE_LOAD_KEY prepare_state; + enum FAPI_STATE_LOAD_KEY state; /**< The current state of key loading */ + enum FAPI_STATE_PREPARE_LOAD_KEY prepare_state; NODE_STR_T *path_list; /**< The current used hierarchy for CreatePrimary */ NODE_OBJECT_T *key_list; IFAPI_OBJECT auth_object; @@ -797,7 +797,7 @@ typedef union { } IFAPI_CMD_STATE; /** The states for the FAPI's primary key regeneration */ -enum _FAPI_STATE_PRIMARY { +enum FAPI_STATE_PRIMARY { PRIMARY_INIT = 0, PRIMARY_READ_KEY, PRIMARY_READ_HIERARCHY, @@ -812,7 +812,7 @@ enum _FAPI_STATE_PRIMARY { }; /** The states for the FAPI's primary key regeneration */ -enum _FAPI_STATE_SESSION { +enum FAPI_STATE_SESSION { SESSION_INIT = 0, SESSION_WAIT_FOR_PRIMARY, SESSION_CREATE_SESSION, @@ -821,23 +821,23 @@ enum _FAPI_STATE_SESSION { }; /** The states for the FAPI's get random state */ -enum _FAPI_STATE_GET_RANDOM { +enum FAPI_STATE_GET_RANDOM { GET_RANDOM_INIT = 0, GET_RANDOM_SENT }; /** The states for flushing objects */ -enum _FAPI_FLUSH_STATE { +enum FAPI_FLUSH_STATE { FLUSH_INIT = 0, WAIT_FOR_FLUSH }; /** The states for the FAPI's internal state machine */ -enum _FAPI_STATE { - _FAPI_STATE_INIT = 0, /**< The initial state after creation or after +enum FAPI_STATE { + FAPI_STATE_INIT = 0, /**< The initial state after creation or after finishing a command. A new command can only be issued in this state. */ - _FAPI_STATE_INTERNALERROR, /**< A non-recoverable error occurred within the + FAPI_STATE_INTERNALERROR, /**< A non-recoverable error occurred within the ESAPI code. */ INITIALIZE_READ, INITIALIZE_INIT_TCTI, @@ -1165,14 +1165,14 @@ struct FAPI_CONTEXT { struct IFAPI_PROFILES profiles; TPMS_TIME_INFO init_time; /**< The current time during FAPI initialization. **/ - enum _FAPI_STATE state; /**< The current state of the command execution */ - enum _FAPI_STATE_PRIMARY primary_state; /**< The current state of the primary regeneration */ - enum _FAPI_STATE_SESSION session_state; /**< The current state of the session creation */ - enum _FAPI_STATE_GET_RANDOM get_random_state; /**< The current state of get random */ + enum FAPI_STATE state; /**< The current state of the command execution */ + enum FAPI_STATE_PRIMARY primary_state; /**< The current state of the primary regeneration */ + enum FAPI_STATE_SESSION session_state; /**< The current state of the session creation */ + enum FAPI_STATE_GET_RANDOM get_random_state; /**< The current state of get random */ enum IFAPI_HIERACHY_AUTHORIZATION_STATE hierarchy_state; enum IFAPI_HIERACHY_POLICY_AUTHORIZATION_STATE hierarchy_policy_state; enum IFAPI_GET_CERT_STATE get_cert_state; - enum _FAPI_FLUSH_STATE flush_object_state; /**< The current state of a flush operation */ + enum FAPI_FLUSH_STATE flush_object_state; /**< The current state of a flush operation */ enum IFAPI_CLEANUP_STATE cleanup_state; /**< The state of cleanup after command execution */ enum IFAPI_READ_NV_PUBLIC_STATE read_nv_public_state; IFAPI_CONFIG config; /**< The profile independent configuration data */ diff --git a/src/tss2-fapi/fapi_util.c b/src/tss2-fapi/fapi_util.c index 4e79c5495..30161a674 100644 --- a/src/tss2-fapi/fapi_util.c +++ b/src/tss2-fapi/fapi_util.c @@ -1117,7 +1117,7 @@ ifapi_session_init(FAPI_CONTEXT *context) return_if_null(context->esys, "No context", TSS2_FAPI_RC_NO_TPM); - if (context->state != _FAPI_STATE_INIT) { + if (context->state != FAPI_STATE_INIT) { return_error(TSS2_FAPI_RC_BAD_SEQUENCE, "Invalid State"); } @@ -1145,7 +1145,7 @@ ifapi_non_tpm_mode_init(FAPI_CONTEXT *context) LOG_TRACE("call"); return_if_null(context, "No context", TSS2_FAPI_RC_BAD_REFERENCE); - if (context->state != _FAPI_STATE_INIT) { + if (context->state != FAPI_STATE_INIT) { return_error(TSS2_FAPI_RC_BAD_SEQUENCE, "Invalid State"); } @@ -2697,7 +2697,7 @@ ifapi_nv_read( return r; } -#define min(X,Y) (X>Y)?Y:X +#define min(X,Y) ((X)>(Y))?(Y):X /** State machine to retrieve random data from TPM. * @@ -4128,28 +4128,29 @@ ifapi_free_objects(FAPI_CONTEXT *context) } } +// NOLINTBEGIN(bugprone-macro-parentheses) #define ADD_CAPABILITY_INFO(capability, field, subfield, max_count, property_count) \ - if (context->cmd.GetInfo.fetched_data->data.capability.count > max_count - property_count) { \ - context->cmd.GetInfo.fetched_data->data.capability.count = max_count - property_count; \ + if (context->cmd.GetInfo.fetched_data->data.capability.count > (max_count) - (property_count)) { \ + context->cmd.GetInfo.fetched_data->data.capability.count = (max_count) - (property_count); \ } \ \ memmove(&context->cmd.GetInfo.capability_data->data.capability.field[property_count], \ context->cmd.GetInfo.fetched_data->data.capability.field, \ context->cmd.GetInfo.fetched_data->data.capability.count \ * sizeof(context->cmd.GetInfo.fetched_data->data.capability.field[0])); \ - property_count += context->cmd.GetInfo.fetched_data->data.capability.count; \ + (property_count) += context->cmd.GetInfo.fetched_data->data.capability.count; \ \ context->cmd.GetInfo.capability_data->data.capability.count = property_count; \ \ - if (more_data && property_count < count \ + if (more_data && (property_count) < count \ && context->cmd.GetInfo.fetched_data->data.capability.count) { \ context->cmd.GetInfo.property \ = context->cmd.GetInfo.capability_data->data. \ - capability.field[property_count - 1]subfield + 1; \ + capability.field[(property_count) - 1]subfield + 1; \ } else { \ more_data = false; \ } - +// NOLINTEND(bugprone-macro-parentheses) /** Prepare the receiving of capability data. * @@ -4310,12 +4311,12 @@ ifapi_capability_get(FAPI_CONTEXT *context, TPM2_CAP capability, context->state = GET_INFO_GET_CAP_MORE; return TSS2_FAPI_RC_TRY_AGAIN; } else { - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; return TSS2_RC_SUCCESS; } error_cleanup: - context->state = _FAPI_STATE_INIT; + context->state = FAPI_STATE_INIT; SAFE_FREE(context->cmd.GetInfo.capability_data); SAFE_FREE(context->cmd.GetInfo.fetched_data); return r; diff --git a/src/tss2-fapi/ifapi_curl.c b/src/tss2-fapi/ifapi_curl.c index 6280a79f3..18f4a9ff9 100644 --- a/src/tss2-fapi/ifapi_curl.c +++ b/src/tss2-fapi/ifapi_curl.c @@ -37,7 +37,7 @@ static X509 unsigned const char* tmp_ptr1 = buffer; unsigned const char** tmp_ptr2 = &tmp_ptr1; - if (!d2i_X509(&cert, tmp_ptr2, cert_buffer_size)) + if (!d2i_X509(&cert, tmp_ptr2, (long) cert_buffer_size)) return NULL; return cert; } @@ -59,7 +59,7 @@ static X509 /* Use BIO for conversion */ size_t pem_length = strlen(pem_cert); - bufio = BIO_new_mem_buf((void *)pem_cert, pem_length); + bufio = BIO_new_mem_buf((void *)pem_cert, (int) pem_length); if (!bufio) return NULL; /* Convert the certificate */ @@ -119,7 +119,7 @@ get_crl_from_cert(X509 *cert, X509_CRL **crl) unsigned const char** tmp_ptr2 = &tmp_ptr1; if (crl_buffer_size > 0) { - if (!d2i_X509_CRL(crl, tmp_ptr2, crl_buffer_size)) { + if (!d2i_X509_CRL(crl, tmp_ptr2, (long) crl_buffer_size)) { goto_error(r, TSS2_FAPI_RC_BAD_VALUE, "Can't convert crl.", cleanup); } } diff --git a/src/tss2-fapi/ifapi_eventlog_system.c b/src/tss2-fapi/ifapi_eventlog_system.c index 1527db181..f27a72005 100644 --- a/src/tss2-fapi/ifapi_eventlog_system.c +++ b/src/tss2-fapi/ifapi_eventlog_system.c @@ -65,7 +65,7 @@ get_number(const char *token, int64_t *num) * @retval the position of the sub string after the prefix. * @retval 0 if no prefix is found. */ -static int +static unsigned int get_token_start_idx(const char *token) { uint itoken = 0; @@ -216,7 +216,7 @@ bool parse_event2body(TCG_EVENT2 const *event, UINT32 type) { size_t len = strlen(hcrtm_data); BYTE *data = (BYTE *)event->Event; if (event->EventSize != len || - strncmp((const char *)data, hcrtm_data, len)) { + strncmp((const char *)data, hcrtm_data, len) != 0) { LOG_ERROR("HCRTM Event Data MUST be the string: \"%s\"", hcrtm_data); return false; } @@ -449,7 +449,7 @@ bool specid_event(TCG_EVENT const *event, size_t size, TCG_SPECID_EVENT *event_specid = (TCG_SPECID_EVENT*)event->event; /* Check the signature */ - if (strcmp((char *)&event_specid->Signature[0], "Spec ID Event03")) { + if (strcmp((char *)&event_specid->Signature[0], "Spec ID Event03") != 0) { LOG_ERROR("Check of signature \"Spec ID Event03\" failed."); return false; } @@ -552,7 +552,7 @@ ifapi_json_TCG_EVENT_TYPE_deserialize_txt(json_object *jso, return TSS2_RC_SUCCESS; } else { - int itoken = get_token_start_idx(token); + unsigned int itoken = get_token_start_idx(token); size_t i; size_t n = sizeof(deserialize_TCG_EVENT_TYPE_tab) / sizeof(deserialize_TCG_EVENT_TYPE_tab[0]); diff --git a/src/tss2-fapi/ifapi_get_web_cert.c b/src/tss2-fapi/ifapi_get_web_cert.c index 890e6e921..b2000217f 100644 --- a/src/tss2-fapi/ifapi_get_web_cert.c +++ b/src/tss2-fapi/ifapi_get_web_cert.c @@ -261,7 +261,7 @@ base64_encode(const unsigned char* buffer) CURL *curl = curl_easy_init(); if (curl) { - char *output = curl_easy_escape(curl, b64text, len); + char *output = curl_easy_escape(curl, b64text, (int) len); if (output) { final_string = strdup(output); curl_free(output); @@ -310,7 +310,7 @@ base64_decode(unsigned char* buffer, size_t len, size_t *new_len) if (curl) { /* Convert URL encoded string to a "plain string" */ char *output = curl_easy_unescape(curl, (char *)buffer, - len, &unescape_len); + (int) len, &unescape_len); if (output) { unescaped_string = strdup(output); curl_free(output); diff --git a/src/tss2-fapi/ifapi_helpers.c b/src/tss2-fapi/ifapi_helpers.c index edaf70c34..e7f6eeeb7 100644 --- a/src/tss2-fapi/ifapi_helpers.c +++ b/src/tss2-fapi/ifapi_helpers.c @@ -1623,7 +1623,7 @@ ifapi_object_cmp_name(IFAPI_OBJECT *object, void *name, bool *equal) } if (obj_name->size != ((TPM2B_NAME *)name)->size) return TSS2_RC_SUCCESS; - if (memcmp(&obj_name->name[0], &((TPM2B_NAME *)name)->name[0], obj_name->size)) + if (memcmp(&obj_name->name[0], &((TPM2B_NAME *)name)->name[0], obj_name->size) != 0) /* The names are not equal */ return TSS2_RC_SUCCESS; /* The two names are equal */ diff --git a/src/tss2-fapi/ifapi_ima_eventlog.c b/src/tss2-fapi/ifapi_ima_eventlog.c index c340c706f..ea2cb1b06 100644 --- a/src/tss2-fapi/ifapi_ima_eventlog.c +++ b/src/tss2-fapi/ifapi_ima_eventlog.c @@ -589,7 +589,7 @@ static TSS2_RC read_event_buffer(IFAPI_IMA_TEMPLATE *template, FILE *fp) { bool old_ima_format; - int size, rsize; + size_t size, rsize; /* Check IMA legacy format. */ if (strcmp(template->ima_type, "ima") == 0) { diff --git a/src/tss2-fapi/ifapi_io.c b/src/tss2-fapi/ifapi_io.c index 86f539bea..d1058f394 100644 --- a/src/tss2-fapi/ifapi_io.c +++ b/src/tss2-fapi/ifapi_io.c @@ -144,10 +144,10 @@ ifapi_io_read_finish( size_t *length) { io->pollevents = POLLIN; - if (_ifapi_io_retry-- > 0) + if (ifapi_io_retry-- > 0) return TSS2_FAPI_RC_TRY_AGAIN; else - _ifapi_io_retry = _IFAPI_IO_RETRIES; + ifapi_io_retry = IFAPI_IO_RETRIES; ssize_t ret = read(fileno(io->stream), &io->char_rbuffer[io->buffer_idx], @@ -269,10 +269,10 @@ ifapi_io_write_finish( struct IFAPI_IO *io) { io->pollevents = POLLOUT; - if (_ifapi_io_retry-- > 0) + if (ifapi_io_retry-- > 0) return TSS2_FAPI_RC_TRY_AGAIN; else - _ifapi_io_retry = _IFAPI_IO_RETRIES; + ifapi_io_retry = IFAPI_IO_RETRIES; ssize_t ret = write(fileno(io->stream), &io->char_rbuffer[io->buffer_idx], diff --git a/src/tss2-fapi/ifapi_io.h b/src/tss2-fapi/ifapi_io.h index 1f8f3d22d..d89cb489f 100644 --- a/src/tss2-fapi/ifapi_io.h +++ b/src/tss2-fapi/ifapi_io.h @@ -26,10 +26,10 @@ typedef struct IFAPI_IO { #ifdef TEST_FAPI_ASYNC #define _IFAPI_IO_RETRIES 1 #else /* TEST_FAPI_ASYNC */ -#define _IFAPI_IO_RETRIES 0 +#define IFAPI_IO_RETRIES 0 #endif /* TEST_FAPI_ASYNC */ -static int _ifapi_io_retry __attribute__((unused)) = _IFAPI_IO_RETRIES; +static int ifapi_io_retry __attribute__((unused)) = IFAPI_IO_RETRIES; #define IFAPI_IO_STREAM context->io.stream #define IFAPI_IO_BUFF context->io.char_buffer diff --git a/src/tss2-fapi/ifapi_json_deserialize.c b/src/tss2-fapi/ifapi_json_deserialize.c index 3dcefc10d..540829771 100644 --- a/src/tss2-fapi/ifapi_json_deserialize.c +++ b/src/tss2-fapi/ifapi_json_deserialize.c @@ -59,10 +59,10 @@ static char *tss_const_prefixes[] = { "TPM2_ALG_", "TPM2_", "TPM_", "TPMA_", "PO * @retval the position of the sub string after the prefix. * @retval 0 if no prefix is found. */ -static int +static unsigned int get_token_start_idx(const char *token) { - int itoken = 0; + unsigned int itoken = 0; char *entry; int i; @@ -830,7 +830,7 @@ ifapi_json_IFAPI_EVENT_TYPE_deserialize_txt(json_object *jso, return TSS2_RC_SUCCESS; } else { - int itoken = get_token_start_idx(token); + int unsigned itoken = get_token_start_idx(token); size_t i; size_t n = sizeof(deserialize_IFAPI_EVENT_TYPE_tab) / sizeof(deserialize_IFAPI_EVENT_TYPE_tab[0]); diff --git a/src/tss2-fapi/ifapi_json_deserialize.h b/src/tss2-fapi/ifapi_json_deserialize.h index acb55045f..bae2362ae 100644 --- a/src/tss2-fapi/ifapi_json_deserialize.h +++ b/src/tss2-fapi/ifapi_json_deserialize.h @@ -35,7 +35,7 @@ if (!ifapi_get_sub_object(jso, json_name, &jso2)) { \ memset(&out->name, 0, sizeof(type)); \ } else { \ - cond_cnt++; \ + (cond_cnt)++; \ json_object* jso_size; \ if (ifapi_get_sub_object(jso2, "size", &jso_size)) { \ tpm2b_type tmp = { 0 }; \ diff --git a/src/tss2-fapi/ifapi_json_eventlog_serialize.c b/src/tss2-fapi/ifapi_json_eventlog_serialize.c index 940adb6bd..c176a5d54 100644 --- a/src/tss2-fapi/ifapi_json_eventlog_serialize.c +++ b/src/tss2-fapi/ifapi_json_eventlog_serialize.c @@ -37,7 +37,7 @@ } #define return_if_jso_error(r,msg, jso) \ - if (r != TSS2_RC_SUCCESS) { \ + if ((r) != TSS2_RC_SUCCESS) { \ LOG_ERROR("%s " TPM2_ERROR_FORMAT, msg, TPM2_ERROR_TEXT(r)); \ if (jso) { \ json_object_put(jso); \ @@ -297,7 +297,7 @@ TSS2_RC trace_unicodename( const char16_t *UnicodeName, UINT64 UnicodeNameLength) { - int ret = 0; + size_t ret = 0; char *mbstr = NULL, *tmp = NULL; mbstate_t st; @@ -311,7 +311,7 @@ TSS2_RC trace_unicodename( for(size_t i = 0; i < UnicodeNameLength; ++i, tmp += ret) { ret = c16rtomb(tmp, UnicodeName[i], &st); - if (ret < 0) { + if (ret == (size_t) -1) { LOG_ERROR("c16rtomb failed: %s", strerror(errno)); free(mbstr); return TSS2_FAPI_RC_BAD_VALUE; @@ -528,7 +528,7 @@ TSS2_RC ifapi_json_TCG_EVENT_HEADER2_serialize( } jso2 = NULL; - jso2 = json_object_new_int64(recnum); + jso2 = json_object_new_int64((int64_t) recnum); return_if_null(jso2, "Out of memory.", TSS2_FAPI_RC_MEMORY); if (json_object_object_add(*jso, "recnum", jso2)) { return_error(TSS2_FAPI_RC_GENERAL_FAILURE, "Could not add json object."); @@ -632,7 +632,7 @@ TSS2_RC ifapi_json_TCG_EVENT_serialize(const TCG_EVENT *in, size_t recnum, json_ if (json_object_object_add(*jso, "pcr", jso2)) { return_error(TSS2_FAPI_RC_GENERAL_FAILURE, "Could not add json object."); } - jso2 = json_object_new_int64(recnum); + jso2 = json_object_new_int64((int64_t) recnum); return_if_null(jso2, "Out of memory.", TSS2_FAPI_RC_MEMORY); if (json_object_object_add(*jso, "recnum", jso2)) { diff --git a/src/tss2-fapi/ifapi_json_serialize.c b/src/tss2-fapi/ifapi_json_serialize.c index be97a8037..b8ec19545 100644 --- a/src/tss2-fapi/ifapi_json_serialize.c +++ b/src/tss2-fapi/ifapi_json_serialize.c @@ -41,7 +41,7 @@ } #define return_if_jso_error(r,msg, jso) \ - if (r != TSS2_RC_SUCCESS) { \ + if ((r) != TSS2_RC_SUCCESS) { \ LOG_ERROR("%s " TPM2_ERROR_FORMAT, msg, TPM2_ERROR_TEXT(r)); \ if (jso) { \ json_object_put(jso); \ @@ -596,7 +596,7 @@ TSS2_RC ifapi_json_IFAPI_OBJECT_TYPE_CONSTANT_serialize(const IFAPI_OBJECT_TYPE_CONSTANT in, json_object **jso) { - *jso = json_object_new_int(in); + *jso = json_object_new_int64((int64_t) in); if (*jso == NULL) { LOG_ERROR("Bad value %"PRIx32 "", in); return TSS2_FAPI_RC_BAD_VALUE; diff --git a/src/tss2-fapi/ifapi_keystore.h b/src/tss2-fapi/ifapi_keystore.h index 519c99475..ecd027eae 100644 --- a/src/tss2-fapi/ifapi_keystore.h +++ b/src/tss2-fapi/ifapi_keystore.h @@ -145,11 +145,11 @@ enum IFAPI_IO_STATE { IO_ACTIVE, }; -#define TSS2_OBJECT_TO_IFAPI_OBJECT(p) ((IFAPI_OBJECT *)p) +#define TSS2_OBJECT_TO_IFAPI_OBJECT(p) ((IFAPI_OBJECT *)(p)) /** Type for representing TPM-Resource */ -typedef struct _IFAPI_OBJECT { +typedef struct IFAPI_OBJECT { /* TSS2_OBJECT MUST GO FIRST. In C pointer of first element * is equal to pointer of base type, use this to hide data by * only passing pointer to public in callbacks, however, internal diff --git a/src/tss2-fapi/ifapi_macros.h b/src/tss2-fapi/ifapi_macros.h index 741e3b08b..a9bf62385 100644 --- a/src/tss2-fapi/ifapi_macros.h +++ b/src/tss2-fapi/ifapi_macros.h @@ -10,21 +10,21 @@ #define strdup_check(dest, str, r, label) \ if (str) { \ - dest = strdup(str); \ - if (!dest) { \ - r = TSS2_FAPI_RC_MEMORY; \ + (dest) = strdup(str); \ + if (!(dest)) { \ + (r) = TSS2_FAPI_RC_MEMORY; \ LOG_ERROR("Out of memory."); \ goto label; \ } \ } else { \ - dest = NULL; \ + (dest) = NULL; \ } #define calloc_check(dest, size, r, label) \ { \ - dest = callock(size,1); \ - if (!dest) { \ - r = TSS2_FAPI_RC_MEMORY; \ + (dest) = callock(size,1); \ + if (!(dest)) { \ + (r) = TSS2_FAPI_RC_MEMORY; \ LOG_ERROR("Out of memory."); \ goto label; \ } \ @@ -73,27 +73,27 @@ #define return_if_error_reset_state(r,msg, ...) \ if (r != TSS2_RC_SUCCESS) { \ LOG_ERROR(TPM2_ERROR_FORMAT " " msg, TPM2_ERROR_TEXT(r), ## __VA_ARGS__); \ - context->state = _FAPI_STATE_INIT; \ + context->state = FAPI_STATE_INIT; \ return r; \ } #define goto_if_error_reset_state(r,msg,label, ...) \ if (r != TSS2_RC_SUCCESS) { \ LOG_ERROR(TPM2_ERROR_FORMAT " " msg, TPM2_ERROR_TEXT(r), ## __VA_ARGS__); \ - context->state = _FAPI_STATE_INIT; \ + context->state = FAPI_STATE_INIT; \ goto label; \ } #define goto_error_reset_state(r,v,msg,label) { \ - r = v; \ + (r) = v; \ LOG_ERROR("%s " TPM2_ERROR_FORMAT, msg, TPM2_ERROR_TEXT(r)); \ - context->state = _FAPI_STATE_INIT; \ + context->state = FAPI_STATE_INIT; \ goto label; } #define goto_if_null_reset_state(p,msg,r,ec,label) \ if ((p) == NULL) { \ LOG_ERROR("%s ", (msg)); \ - context->state = _FAPI_STATE_INIT; \ + context->state = FAPI_STATE_INIT; \ (r) = (ec); \ goto label; \ } @@ -105,13 +105,13 @@ } #define check_not_null(X) \ - if (X == NULL) { \ + if ((X) == NULL) { \ LOG_ERROR(str(X) " is NULL: BAD_REFERENCE"); \ return TSS2_FAPI_RC_BAD_REFERENCE; \ } #define check_oom(X) \ - if (X == NULL) { \ + if ((X) == NULL) { \ LOG_ERROR("Out of memory"); \ return TSS2_FAPI_RC_MEMORY; \ } @@ -125,7 +125,7 @@ #define statecase(VAR, STATE) \ case STATE: \ LOG_TRACE("State " str(VAR) " reached " str(STATE)); \ - VAR=STATE; + (VAR)=STATE; #define general_failure(VAR) \ default: \ @@ -140,7 +140,7 @@ #define statecasedefault_error(VAR, r, label) \ default: \ LOG_ERROR("Bad state for " str(VAR)); \ - r = TSS2_FAPI_RC_BAD_SEQUENCE; \ + (r) = TSS2_FAPI_RC_BAD_SEQUENCE; \ goto label; #endif /* IFAPI_MACROS_H */ diff --git a/src/tss2-fapi/ifapi_policy_callbacks.c b/src/tss2-fapi/ifapi_policy_callbacks.c index d94dd76b9..bc4e5c413 100644 --- a/src/tss2-fapi/ifapi_policy_callbacks.c +++ b/src/tss2-fapi/ifapi_policy_callbacks.c @@ -1010,7 +1010,7 @@ compare_policy_digest( if (digest_values->digests[i].hashAlg == hash_alg) { if (memcmp(&digest_values->digests[i].digest, &authPolicy->buffer[0], - authPolicy->size)) + authPolicy->size) != 0) continue; *equal = true; return TSS2_RC_SUCCESS; @@ -1165,7 +1165,7 @@ search_policy( break; default: - context->state = _FAPI_STATE_INTERNALERROR; + context->state = FAPI_STATE_INTERNALERROR; goto_error(r, TSS2_FAPI_RC_BAD_VALUE, "Invalid state for load key.", cleanup); } context->fsearch.state = FSEARCH_INIT; diff --git a/src/tss2-fapi/ifapi_policy_instantiate.c b/src/tss2-fapi/ifapi_policy_instantiate.c index c15277201..8ff7c4648 100644 --- a/src/tss2-fapi/ifapi_policy_instantiate.c +++ b/src/tss2-fapi/ifapi_policy_instantiate.c @@ -147,12 +147,12 @@ set_pem_key_param( } #define CHECK_TEMPLATE_PATH(path, template) \ - if (!path) { \ + if (!(path)) { \ return_error2(TSS2_FAPI_RC_BAD_TEMPLATE, "No path for policy %s", template); \ } #define CHECK_CALLBACK(callback, name) \ - if (!callback) { \ + if (!(callback)) { \ return_error2(TSS2_FAPI_RC_NULL_CALLBACK, "Callback %s was NULL", name) \ } diff --git a/src/tss2-fapi/ifapi_policy_json_deserialize.c b/src/tss2-fapi/ifapi_policy_json_deserialize.c index 509961e11..d80361636 100644 --- a/src/tss2-fapi/ifapi_policy_json_deserialize.c +++ b/src/tss2-fapi/ifapi_policy_json_deserialize.c @@ -38,10 +38,10 @@ static char *tss_const_prefixes[] = { "TPM2_ALG_", "TPM2_", "TPM_", "TPMA_", "PO * @retval the position of the sub string after the prefix. * @retval 0 if no prefix is found. */ -static int +static unsigned int get_token_start_idx(const char *token) { - int itoken = 0; + unsigned int itoken = 0; char *entry; int i; @@ -146,7 +146,7 @@ ifapi_json_TPMI_POLICYTYPE_deserialize_txt(json_object *jso, return TSS2_RC_SUCCESS; } else { - int itoken = get_token_start_idx(token); + int unsigned itoken = get_token_start_idx(token); size_t i; size_t n = sizeof(deserialize_TPMI_POLICYTYPE_tab) / sizeof(deserialize_TPMI_POLICYTYPE_tab[0]); diff --git a/src/tss2-fapi/ifapi_policyutil_execute.c b/src/tss2-fapi/ifapi_policyutil_execute.c index 61cc9c66a..1aec95168 100644 --- a/src/tss2-fapi/ifapi_policyutil_execute.c +++ b/src/tss2-fapi/ifapi_policyutil_execute.c @@ -130,7 +130,7 @@ create_session( break; default: - context->state = _FAPI_STATE_INTERNALERROR; + context->state = FAPI_STATE_INTERNALERROR; goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "Invalid state for create session.", cleanup); } diff --git a/src/tss2-fapi/tpm_json_deserialize.c b/src/tss2-fapi/tpm_json_deserialize.c index 62464aba1..074965b87 100644 --- a/src/tss2-fapi/tpm_json_deserialize.c +++ b/src/tss2-fapi/tpm_json_deserialize.c @@ -257,7 +257,7 @@ ifapi_get_sub_object(json_object *jso, char *name, json_object **sub_jso) } else { char name2[strlen(name) + 1]; for (i = 0; name[i]; i++) - name2[i] = tolower(name[i]); + name2[i] = (char) tolower(name[i]); name2[strlen(name)] = '\0'; return json_object_object_get_ex(jso, name2, sub_jso); } @@ -299,9 +299,9 @@ get_boolean_from_json(json_object *jso, TPMI_YES_NO *value) TSS2_RC r = ifapi_json_TPMI_YES_NO_deserialize(jso, value); if (r != TSS2_RC_SUCCESS) { const char *token = json_object_get_string(jso); - if (strcasecmp(token, "set") || strcasecmp(token, "on")) { + if (strcasecmp(token, "set") != 0 || strcasecmp(token, "on") != 0) { *value = 1; - } else if (strcasecmp(token, "off")) { + } else if (strcasecmp(token, "off") != 0) { *value = 0; } else { return_error(TSS2_FAPI_RC_BAD_VALUE, "No boolean value"); @@ -331,7 +331,7 @@ ifapi_json_pcr_selection_deserialize( TSS2_RC r; size_t i; int64_t n; - int n_byte = 0; + int64_t n_byte = 0; json_type jso_type = json_object_get_type(jso); if (jso_type != json_type_array) { @@ -543,11 +543,11 @@ ifapi_json_BYTE_array_deserialize(size_t max, json_object *jso, BYTE *out) LOG_TRACE("call"); json_type jso_type = json_object_get_type(jso); if (jso_type == json_type_array) { - int size = json_object_array_length(jso); - if (size > (int)max) { - LOG_ERROR("Array of BYTE too large (%i > %zu)", size, max); + size_t size = json_object_array_length(jso); + if (size > max) { + LOG_ERROR("Array of BYTE too large (%zu > %zu)", size, max); } - for (int i = 0; i < size; i++) { + for (size_t i = 0; i < size; i++) { json_object *jso2 = json_object_array_get_idx(jso, i); TSS2_RC r = ifapi_json_BYTE_deserialize(jso2, &out[i]); return_if_error(r, "BAD VALUE"); diff --git a/src/tss2-fapi/tpm_json_serialize.c b/src/tss2-fapi/tpm_json_serialize.c index a6c80bd79..cbc3eb03b 100644 --- a/src/tss2-fapi/tpm_json_serialize.c +++ b/src/tss2-fapi/tpm_json_serialize.c @@ -34,7 +34,7 @@ } #define return_if_jso_error(r,msg, jso) \ - if (r != TSS2_RC_SUCCESS) { \ + if ((r) != TSS2_RC_SUCCESS) { \ LOG_ERROR("%s " TPM2_ERROR_FORMAT, msg, TPM2_ERROR_TEXT(r)); \ if (jso) { \ json_object_put(jso); \ @@ -85,7 +85,7 @@ ifapi_json_pcr_select_serialize( for (i1 = 0; i1 < TPM2_PCR_LAST - TPM2_PCR_FIRST; i1++) { i2 = i1 + TPM2_PCR_FIRST; if (pcrSelect[i2 / 8] & (((BYTE)1) << (i2 % 8))) { - jso2 = json_object_new_int(i2); + jso2 = json_object_new_int64(i2); return_if_null(jso2, "Out of memory.", TSS2_FAPI_RC_MEMORY); if (json_object_array_add(*jso, jso2)) { return_error(TSS2_FAPI_RC_GENERAL_FAILURE, "Could not add json object."); @@ -321,7 +321,7 @@ ifapi_json_UINT64_serialize(UINT64 in, json_object **jso) { json_object *jso1 = NULL, *jso2 = NULL; if (in < 0x1000000000000) { - *jso = json_object_new_int64(in); + *jso = json_object_new_int64((int64_t) in); if (*jso == NULL) { LOG_ERROR("Bad value %"PRIu32 "", (uint32_t)in); return TSS2_FAPI_RC_BAD_VALUE; @@ -329,12 +329,12 @@ ifapi_json_UINT64_serialize(UINT64 in, json_object **jso) return TSS2_RC_SUCCESS; } - jso1 = json_object_new_int64(in / 0x100000000); + jso1 = json_object_new_int64((int64_t) (in / 0x100000000)); return_if_null(jso1, "Out of memory.", TSS2_FAPI_RC_MEMORY); in %= 0x100000000; - jso2 = json_object_new_int64(in); + jso2 = json_object_new_int64((int64_t) in); if (!jso2) json_object_put(jso1); return_if_null(jso2, "Out of memory.", TSS2_FAPI_RC_MEMORY); @@ -873,7 +873,7 @@ ifapi_json_TPM2_PT_PCR_serialize(const TPM2_PT_PCR in, json_object **jso) TSS2_RC ifapi_json_TPM2_HANDLE_serialize(const TPM2_HANDLE in, json_object **jso) { - *jso = json_object_new_int(in); + *jso = json_object_new_int((int32_t) in); if (*jso == NULL) { LOG_ERROR("Bad value %"PRIx32 "", in); return TSS2_FAPI_RC_BAD_VALUE; diff --git a/src/tss2-mu/base-types.c b/src/tss2-mu/base-types.c index 8695a32b1..1e13c9795 100644 --- a/src/tss2-mu/base-types.c +++ b/src/tss2-mu/base-types.c @@ -85,6 +85,7 @@ Tss2_MU_##type##_Marshal ( \ return TSS2_RC_SUCCESS; \ } +// NOLINTBEGIN(bugprone-macro-parentheses) #define BASE_UNMARSHAL(type) \ TSS2_RC \ Tss2_MU_##type##_Unmarshal ( \ @@ -153,6 +154,7 @@ Tss2_MU_##type##_Unmarshal ( \ \ return TSS2_RC_SUCCESS; \ } +// NOLINTEND(bugprone-macro-parentheses) /* * These macros expand to (un)marshal functions for each of the base types diff --git a/src/tss2-mu/tpm2b-types.c b/src/tss2-mu/tpm2b-types.c index a72a1b364..6d55fb360 100644 --- a/src/tss2-mu/tpm2b-types.c +++ b/src/tss2-mu/tpm2b-types.c @@ -88,6 +88,7 @@ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ return TSS2_RC_SUCCESS; \ } +// NOLINTBEGIN(bugprone-macro-parentheses) #define TPM2B_UNMARSHAL(type, buf_name) \ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ size_t *offset, type *dest) \ @@ -156,6 +157,7 @@ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ \ return TSS2_RC_SUCCESS; \ } +// NOLINTEND(bugprone-macro-parentheses) #define TPM2B_MARSHAL_SUBTYPE(type, subtype, member) \ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ @@ -223,6 +225,7 @@ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ return TSS2_RC_SUCCESS; \ } +// NOLINTBEGIN(bugprone-macro-parentheses) #define TPM2B_UNMARSHAL_SUBTYPE(type, subtype, member) \ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ size_t *offset, type *dest) \ @@ -294,6 +297,7 @@ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ \ return TSS2_RC_SUCCESS; \ } +// NOLINTEND(bugprone-macro-parentheses) /* * These macros expand to (un)marshal functions for each of the TPM2B types diff --git a/src/tss2-mu/tpma-types.c b/src/tss2-mu/tpma-types.c index 8cdc3d736..d0c4a6f1e 100644 --- a/src/tss2-mu/tpma-types.c +++ b/src/tss2-mu/tpma-types.c @@ -81,6 +81,7 @@ TSS2_RC Tss2_MU_##type##_Marshal(type src, uint8_t buffer[], \ return TSS2_RC_SUCCESS; \ } +// NOLINTBEGIN(bugprone-macro-parentheses) #define TPMA_UNMARSHAL(type) \ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ size_t *offset, type *dest) \ @@ -145,6 +146,7 @@ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ } \ return TSS2_RC_SUCCESS; \ } +// NOLINTEND(bugprone-macro-parentheses) /* * These macros expand to (un)marshal functions for each of the TPMA types diff --git a/src/tss2-mu/tpml-types.c b/src/tss2-mu/tpml-types.c index ca2eb0dea..bb383e3f6 100644 --- a/src/tss2-mu/tpml-types.c +++ b/src/tss2-mu/tpml-types.c @@ -19,9 +19,9 @@ #define LOGMODULE marshal #include "util/log.h" // for LOG_DEBUG, LOG_ERROR, LOG_TRACE, LOG_WA... -#define ADDR & +#define ADDR & // NOLINT(bugprone-macro-parentheses) #define VAL -#define TAB_SIZE(tab) (sizeof(tab) / sizeof(tab[0])) +#define TAB_SIZE(tab) (sizeof(tab) / sizeof((tab)[0])) #define TPML_MARSHAL(type, marshal_func, buf_name, op) \ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ @@ -85,6 +85,7 @@ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ return TSS2_RC_SUCCESS; \ } +// NOLINTBEGIN(bugprone-macro-parentheses) #define TPML_UNMARSHAL(type, unmarshal_func, buf_name) \ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ size_t *offset, type *dest) \ @@ -149,6 +150,7 @@ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ \ return TSS2_RC_SUCCESS; \ } +// NOLINTEND(bugprone-macro-parentheses) /* * These macros expand to (un)marshal functions for each of the TPML types diff --git a/src/tss2-mu/tpms-types.c b/src/tss2-mu/tpms-types.c index b234bed20..47df3ff30 100644 --- a/src/tss2-mu/tpms-types.c +++ b/src/tss2-mu/tpms-types.c @@ -15,9 +15,9 @@ #define LOGMODULE marshal #include "util/log.h" // for LOG_DEBUG, LOG_WARNING, LOG_ERROR -#define ADDR & +#define ADDR & // NOLINT(bugprone-macro-parentheses) #define VAL -#define TAB_SIZE(tab) (sizeof(tab) / sizeof(tab[0])) +#define TAB_SIZE(tab) (sizeof(tab) / sizeof((tab)[0])) static TSS2_RC TPM2_GENERATED_Unmarshal( @@ -101,6 +101,7 @@ TPMS_PCR_MARSHAL(TPMS_PCR_SELECTION, \ TPMS_PCR_MARSHAL(TPMS_TAGGED_PCR_SELECT, \ Tss2_MU_UINT32_Marshal(src->tag, buffer, buffer_size, &local_offset)) +// NOLINTBEGIN(bugprone-macro-parentheses) #define TPMS_PCR_UNMARSHAL(type, firstFieldUnmarshal) \ TSS2_RC \ Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ @@ -108,7 +109,8 @@ Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ { \ TSS2_RC ret = TSS2_RC_SUCCESS; \ size_t local_offset = 0; \ - UINT8 i, tmp; \ + size_t i; \ + UINT8 tmp; \ \ LOG_DEBUG( \ "Unmarshaling " #type " from 0x%" PRIxPTR " to buffer 0x%" PRIxPTR \ @@ -153,6 +155,7 @@ Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ \ return TSS2_RC_SUCCESS; \ } +// NOLINTEND(bugprone-macro-parentheses) TPMS_PCR_UNMARSHAL(TPMS_PCR_SELECT, TSS2_RC_SUCCESS) @@ -185,6 +188,7 @@ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, \ return TSS2_RC_SUCCESS; \ } +// NOLINTBEGIN(bugprone-macro-parentheses) #define TPMS_UNMARSHAL_0(type) \ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ size_t *offset, type *dest) \ @@ -204,6 +208,7 @@ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ \ return TSS2_RC_SUCCESS; \ } +// NOLINTEND(bugprone-macro-parentheses) #define TPMS_MARSHAL_1(type, m, op, fn) \ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ @@ -221,6 +226,7 @@ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ return fn(op src->m, buffer, buffer_size, offset); \ } +// NOLINTBEGIN(bugprone-macro-parentheses) #define TPMS_UNMARSHAL_1(type, m, fn) \ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ size_t *offset, type *dest) \ @@ -265,7 +271,9 @@ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ } \ return ret; \ } +// NOLINTEND(bugprone-macro-parentheses) +// NOLINTBEGIN(bugprone-macro-parentheses) #define TPMS_UNMARSHAL_2_U(type, m1, fn1, m2, fn2) \ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ size_t *offset, type *dest) \ @@ -298,6 +306,7 @@ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ } \ return ret; \ } +// NOLINTEND(bugprone-macro-parentheses) #define TPMS_MARSHAL_2(type, m1, op1, fn1, m2, op2, fn2) \ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ @@ -333,6 +342,7 @@ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ return ret; \ } +// NOLINTBEGIN(bugprone-macro-parentheses) #define TPMS_UNMARSHAL_2(type, m1, fn1, m2, fn2) \ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ size_t *offset, type *dest) \ @@ -364,6 +374,7 @@ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ } \ return ret; \ } +// NOLINTEND(bugprone-macro-parentheses) #define TPMS_MARSHAL_3(type, m1, op1, fn1, m2, op2, fn2, m3, op3, fn3) \ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ @@ -403,6 +414,7 @@ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ return ret; \ } +// NOLINTBEGIN(bugprone-macro-parentheses) #define TPMS_UNMARSHAL_3(type, m1, fn1, m2, fn2, m3, fn3) \ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ size_t *offset, type *dest) \ @@ -438,6 +450,7 @@ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ } \ return ret; \ } +// NOLINTEND(bugprone-macro-parentheses) #define TPMS_MARSHAL_4(type, m1, op1, fn1, m2, op2, fn2, m3, op3, fn3, m4, op4, fn4) \ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ @@ -481,6 +494,7 @@ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ return ret; \ } +// NOLINTBEGIN(bugprone-macro-parentheses) #define TPMS_UNMARSHAL_4(type, m1, fn1, m2, fn2, m3, fn3, m4, fn4) \ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ size_t *offset, type *dest) \ @@ -520,6 +534,7 @@ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ } \ return ret; \ } +// NOLINTEND(bugprone-macro-parentheses) #define TPMS_MARSHAL_5(type, m1, op1, fn1, m2, op2, fn2, m3, op3, fn3, \ m4, op4, fn4, m5, op5, fn5) \ @@ -568,6 +583,7 @@ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ return ret; \ } +// NOLINTBEGIN(bugprone-macro-parentheses) #define TPMS_UNMARSHAL_5(type, m1, fn1, m2, fn2, m3, fn3, m4, fn4, m5, fn5) \ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ size_t *offset, type *dest) \ @@ -611,6 +627,7 @@ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ } \ return ret; \ } +// NOLINTEND(bugprone-macro-parentheses) #define TPMS_MARSHAL_7(type, m1, op1, fn1, m2, op2, fn2, m3, op3, fn3, \ m4, op4, fn4, m5, op5, fn5, m6, op6, fn6, m7, op7, fn7) \ @@ -667,6 +684,7 @@ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ return ret; \ } +// NOLINTBEGIN(bugprone-macro-parentheses) #define TPMS_UNMARSHAL_7(type, m1, fn1, m2, fn2, m3, fn3, m4, fn4, m5, fn5, m6, fn6, m7, fn7) \ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ size_t *offset, type *dest) \ @@ -718,6 +736,7 @@ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ } \ return ret; \ } +// NOLINTEND(bugprone-macro-parentheses) #define TPMS_MARSHAL_7_U(type, m1, op1, fn1, m2, op2, fn2, m3, op3, fn3, \ m4, op4, fn4, m5, op5, fn5, m6, op6, fn6, m7, op7, fn7) \ @@ -774,6 +793,7 @@ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ return ret; \ } +// NOLINTBEGIN(bugprone-macro-parentheses) #define TPMS_UNMARSHAL_7_U(type, m1, fn1, m2, fn2, m3, fn3, m4, fn4, m5, fn5, m6, fn6, m7, fn7) \ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ size_t *offset, type *dest) \ @@ -825,6 +845,7 @@ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ } \ return ret; \ } +// NOLINTEND(bugprone-macro-parentheses) #define TPMS_MARSHAL_11(type, m1, op1, fn1, m2, op2, fn2, m3, op3, fn3, \ m4, op4, fn4, m5, op5, fn5, m6, op6, fn6, m7, op7, fn7, \ @@ -898,6 +919,7 @@ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ return ret; \ } +// NOLINTBEGIN(bugprone-macro-parentheses) #define TPMS_UNMARSHAL_11(type, m1, fn1, m2, fn2, m3, fn3, m4, fn4, m5, fn5, m6, fn6, m7, fn7, \ m8, fn8, m9, fn9, m10, fn10, m11, fn11) \ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ @@ -966,6 +988,7 @@ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ } \ return ret; \ } +// NOLINTEND(bugprone-macro-parentheses) /* * These macros expand to (un)marshal functions for each of the TPMS types diff --git a/src/tss2-mu/tpmt-types.c b/src/tss2-mu/tpmt-types.c index 82854ae6a..973ad7c90 100644 --- a/src/tss2-mu/tpmt-types.c +++ b/src/tss2-mu/tpmt-types.c @@ -19,7 +19,7 @@ #define LOGMODULE marshal #include "util/log.h" // for LOG_DEBUG -#define ADDR & +#define ADDR & // NOLINT(bugprone-macro-parentheses) #define VAL #define TPMT_MARSHAL_2(type, m1, op1, fn1, m2, op2, sel, fn2) \ @@ -54,6 +54,7 @@ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ return ret; \ } +// NOLINTBEGIN(bugprone-macro-parentheses) #define TPMT_UNMARSHAL_2(type, m1, fn1, m2, sel, fn2) \ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ size_t *offset, type *dest) \ @@ -85,6 +86,7 @@ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ \ return ret; \ } +// NOLINTEND(bugprone-macro-parentheses) #define TPMT_MARSHAL_3(type, m1, op1, fn1, m2, op2, sel2, fn2, m3, op3, sel3, fn3) \ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ @@ -122,6 +124,7 @@ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ return ret; \ } +// NOLINTBEGIN(bugprone-macro-parentheses) #define TPMT_UNMARSHAL_3(type, m1, fn1, m2, sel2, fn2, m3, sel3, fn3) \ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ size_t *offset, type *dest) \ @@ -157,6 +160,7 @@ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ \ return ret; \ } +// NOLINTEND(bugprone-macro-parentheses) #define TPMT_MARSHAL_TK(type, m1, fn1, m2, fn2, m3, fn3) \ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ @@ -194,6 +198,7 @@ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ return ret; \ } +// NOLINTBEGIN(bugprone-macro-parentheses) #define TPMT_UNMARSHAL_TK(type, m1, fn1, m2, fn2, m3, fn3) \ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ size_t *offset, type *dest) \ @@ -226,6 +231,7 @@ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ \ return ret; \ } +// NOLINTEND(bugprone-macro-parentheses) #define TPMT_MARSHAL_4(type, m1, op1, fn1, m2, op2, fn2, m3, op3, fn3, \ m4, sel4, op4, fn4) \ @@ -268,6 +274,7 @@ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ return ret; \ } +// NOLINTBEGIN(bugprone-macro-parentheses) #define TPMT_UNMARSHAL_4(type, m1, fn1, m2, fn2, m3, fn3, m4, sel4, fn4) \ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ size_t *offset, type *dest) \ @@ -307,6 +314,7 @@ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ \ return ret; \ } +// NOLINTEND(bugprone-macro-parentheses) #define TPMT_MARSHAL_5(type, m1, op1, fn1, m2, op2, fn2, m3, op3, fn3, \ m4, op4, fn4, m5, op5, fn5) \ @@ -353,6 +361,7 @@ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ return ret; \ } +// NOLINTBEGIN(bugprone-macro-parentheses) #define TPMT_UNMARSHAL_5(type, m1, fn1, m2, fn2, m3, fn3, m4, fn4, m5, fn5) \ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ size_t *offset, type *dest) \ @@ -393,6 +402,7 @@ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ \ return ret; \ } +// NOLINTEND(bugprone-macro-parentheses) #define TPMT_MARSHAL_6(type, m1, op1, fn1, m2, op2, fn2, m3, op3, fn3, \ m4, op4, fn4, m5, op5, sel5, fn5, m6, op6, sel6, fn6) \ @@ -443,6 +453,7 @@ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ return ret; \ } +// NOLINTBEGIN(bugprone-macro-parentheses) #define TPMT_UNMARSHAL_6(type, m1, fn1, m2, fn2, m3, fn3, m4, fn4, m5, sel5, fn5, m6, sel6, fn6) \ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ size_t *offset, type *dest) \ @@ -490,6 +501,7 @@ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ \ return ret; \ } +// NOLINTEND(bugprone-macro-parentheses) /* * These macros expand to (un)marshal functions for each of the TPMT types diff --git a/src/tss2-mu/tpmu-types.c b/src/tss2-mu/tpmu-types.c index f9abfa010..aa60cf422 100644 --- a/src/tss2-mu/tpmu-types.c +++ b/src/tss2-mu/tpmu-types.c @@ -20,7 +20,7 @@ #define LOGMODULE marshal #include "util/log.h" // for LOG_DEBUG, LOG_ERROR, LOG_WARNING, LOG_... -#define ADDR & +#define ADDR & // NOLINT(bugprone-macro-parentheses) #define VAL static TSS2_RC marshal_tab(BYTE const *src, uint8_t buffer[], @@ -375,6 +375,7 @@ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint32_t selector, uint8_t buf * needed because the first parameter to the function element is always a * reference (never a value). */ +// NOLINTBEGIN(bugprone-macro-parentheses) #define TPMU_UNMARSHAL(type, sel, m, fn, sel2, m2, fn2, sel3, m3, fn3, \ sel4, m4, fn4, sel5, m5, fn5, sel6, m6, fn6, sel7, m7, fn7, \ sel8, m8, fn8, sel9, m9, fn9, sel10, m10, fn10, sel11, m11, fn11, \ @@ -432,6 +433,7 @@ TSS2_RC Tss2_MU_##type##_Unmarshal(uint8_t const buffer[], size_t buffer_size, \ } \ return ret; \ } +// NOLINTEND(bugprone-macro-parentheses) /* * The TPMU_UNMARSHAL2 operates on the same principles as the TPMU_MARSHAL2 diff --git a/src/tss2-policy/tss2_policy.c b/src/tss2-policy/tss2_policy.c index 3b4c162ab..ca7773680 100644 --- a/src/tss2-policy/tss2_policy.c +++ b/src/tss2-policy/tss2_policy.c @@ -28,10 +28,10 @@ #define LOGMODULE "policy" #include "util/log.h" // for LOG_ERROR, str, LOG_TRACE -#define JSON_OBJECT_SAFE_PUT(o) do { json_object_put(o); o = NULL; } while(0) +#define JSON_OBJECT_SAFE_PUT(o) do { json_object_put(o); (o) = NULL; } while(0) #define policy_check_not_null(X) \ - if (X == NULL) { \ + if ((X) == NULL) { \ LOG_ERROR(str(X) " is NULL: BAD_REFERENCE"); \ return TSS2_POLICY_RC_BAD_REFERENCE; \ } @@ -415,7 +415,8 @@ Tss2_PolicyGetDescription( policy_ctx->path); const char *description = policy_ctx->policy.description; - size_t len = strlen(description); + /* length including null termination */ + size_t len = strlen(description) + 1; /* NULL buffer let calller know size */ if (!buffer) { @@ -429,9 +430,9 @@ Tss2_PolicyGetDescription( return_if_error(TSS2_POLICY_RC_BUFFER_TOO_SMALL, "Specified buffer is too small"); } - /* all is well, copy it to user and let them know size */ + /* all is well, copy it to user (including null termination) and let them know size */ *size = len; - memcpy(buffer, description, len); + strcpy(buffer, description); LOG_TRACE("finished, returning: 0x0"); return TSS2_RC_SUCCESS; diff --git a/src/tss2-rc/tss2_rc.c b/src/tss2-rc/tss2_rc.c index c834df286..2d112c64e 100644 --- a/src/tss2-rc/tss2_rc.c +++ b/src/tss2-rc/tss2_rc.c @@ -30,7 +30,7 @@ * The format specifier as understood by printf followed by the variadic * parameters for the specifier. */ -#define catbuf(b, fmt, ...) _catbuf(b, sizeof(b), fmt, ##__VA_ARGS__) +#define catbuf(b, fmt, ...) catbuf_internal(b, sizeof(b), fmt, ##__VA_ARGS__) /** * Clears out a static buffer by setting index 0 to the null byte. @@ -56,7 +56,7 @@ clearbuf(char *buffer) * DO NOT CALL DIRECTLY, use the catbuf() macro. */ static void COMPILER_ATTR(format (printf, 3, 4)) -_catbuf(char *buf, size_t len, const char *fmt, ...) +catbuf_internal(char *buf, size_t len, const char *fmt, ...) { va_list argptr; va_start(argptr, fmt); @@ -228,8 +228,7 @@ tss2_fmt1_err_strs_get(TSS2_RC error) /* 0xB - TPM2_RC_HANDLE */ "the handle is not correct for the use", /* 0xC - TPM2_RC_KDF */ - "unsupported key derivation function or function not appropriate for " - "use", + "unsupported key derivation function or function not appropriate for use", /* 0xD - TPM2_RC_RANGE */ "value was out of allowed range", /* 0xE - TPM2_RC_AUTH_FAIL */ @@ -249,8 +248,7 @@ tss2_fmt1_err_strs_get(TSS2_RC error) /* 0x15 - TPM2_RC_SIZE */ "structure is the wrong size", /* 0x16 - TPM2_RC_SYMMETRIC */ - "unsupported symmetric algorithm or key size or not appropriate for" - " instance", + "unsupported symmetric algorithm or key size or not appropriate for instance", /* 0x17 - TPM2_RC_TAG */ "incorrect structure tag", /* 0x18 - TPM2_RC_SELECTOR */ @@ -258,8 +256,7 @@ tss2_fmt1_err_strs_get(TSS2_RC error) /* 0x19 - EMPTY */ NULL, /* 0x1A - TPM2_RC_INSUFFICIENT */ - "the TPM was unable to unmarshal a value because there were not enough" - " octets in the input buffer", + "the TPM was unable to unmarshal a value because there were not enough octets in the input buffer", /* 0x1B - TPM2_RC_SIGNATURE */ "the signature is not valid", /* 0x1C - TPM2_RC_KEY */ @@ -279,6 +276,7 @@ tss2_fmt1_err_strs_get(TSS2_RC error) /* 0x23 - TPM2_RC_EXPIRED */ "the policy has expired", /* 0x24 - TPM2_RC_POLICY_CC */ + // NOLINTNEXTLINE(bugprone-suspicious-missing-comma) "the commandCode in the policy is not the commandCode of the command" " or the command code in a policy command references a command that" " is not implemented", @@ -484,8 +482,7 @@ tss2_fmt0_err_strs_get(TSS2_RC rc) /* 0x24 - TPM2_RC_AUTH_TYPE */ "authorization handle is not correct for command", /* 0x25 - TPM2_RC_AUTH_MISSING */ - "command requires an authorization session for handle and it is" - " not present", + "command requires an authorization session for handle and it is not present", /* 0x26 - TPM2_RC_POLICY */ "policy failure in math operation or an invalid authPolicy value", /* 0x27 - TPM2_RC_PCR */ @@ -501,6 +498,7 @@ tss2_fmt0_err_strs_get(TSS2_RC rc) /* 0x2C - EMPTY */ NULL, /* 0x2D - TPM2_RC_UPGRADE */ + // NOLINTNEXTLINE(bugprone-suspicious-missing-comma) "For all commands, other than TPM2_FieldUpgradeData, " "this code indicates that the TPM is in field upgrade mode. " "For TPM2_FieldUpgradeData, this code indicates that the TPM " @@ -759,6 +757,7 @@ tss_err_handler (TSS2_RC rc) /* 12 - TSS2_BASE_RC_NOT_PERMITTED */ "Operation not permitted.", /* 13 - TSS2_BASE_RC_INVALID_SESSIONS */ + // NOLINTNEXTLINE(bugprone-suspicious-missing-comma) "Session structures were sent, but command doesn't use them or doesn't" " use the specified number of them", /* 14 - TSS2_BASE_RC_NO_DECRYPT_PARAM */ diff --git a/src/tss2-sys/api/Tss2_Sys_ACT_SetTimeout.c b/src/tss2-sys/api/Tss2_Sys_ACT_SetTimeout.c index ca5300631..53e98f489 100644 --- a/src/tss2-sys/api/Tss2_Sys_ACT_SetTimeout.c +++ b/src/tss2-sys/api/Tss2_Sys_ACT_SetTimeout.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_ACT_SetTimeout_Prepare( TPMI_RH_ACT actHandle, UINT32 startTimeout) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -48,7 +48,7 @@ TSS2_RC Tss2_Sys_ACT_SetTimeout_Prepare( TSS2_RC Tss2_Sys_ACT_SetTimeout_Complete(TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -63,7 +63,7 @@ TSS2_RC Tss2_Sys_ACT_SetTimeout( UINT32 startTimeout, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_ACT_SetTimeout_Prepare(sysContext, actHandle, startTimeout); diff --git a/src/tss2-sys/api/Tss2_Sys_AC_GetCapability.c b/src/tss2-sys/api/Tss2_Sys_AC_GetCapability.c index 6b3b33310..ce56909b0 100644 --- a/src/tss2-sys/api/Tss2_Sys_AC_GetCapability.c +++ b/src/tss2-sys/api/Tss2_Sys_AC_GetCapability.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_AC_GetCapability_Prepare( TPM_AT capability, UINT32 count) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -60,7 +60,7 @@ TSS2_RC Tss2_Sys_AC_GetCapability_Complete( TPMI_YES_NO *moreData, TPML_AC_CAPABILITIES *capabilityData) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -93,7 +93,7 @@ TSS2_RC Tss2_Sys_AC_GetCapability( TPML_AC_CAPABILITIES *capabilityData, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_AC_GetCapability_Prepare(sysContext, ac, capability, count); diff --git a/src/tss2-sys/api/Tss2_Sys_AC_Send.c b/src/tss2-sys/api/Tss2_Sys_AC_Send.c index 499ea9e6d..425f893a9 100644 --- a/src/tss2-sys/api/Tss2_Sys_AC_Send.c +++ b/src/tss2-sys/api/Tss2_Sys_AC_Send.c @@ -21,7 +21,7 @@ TSS2_RC Tss2_Sys_AC_Send_Prepare( TPMI_RH_AC ac, TPM2B_MAX_BUFFER *acDataIn) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -75,7 +75,7 @@ TSS2_RC Tss2_Sys_AC_Send_Complete( TSS2_SYS_CONTEXT *sysContext, TPMS_AC_OUTPUT *acDataOut) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -101,7 +101,7 @@ TSS2_RC Tss2_Sys_AC_Send( TPMS_AC_OUTPUT *acDataOut, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_AC_Send_Prepare(sysContext, sendObject, authHandle, ac, diff --git a/src/tss2-sys/api/Tss2_Sys_ActivateCredential.c b/src/tss2-sys/api/Tss2_Sys_ActivateCredential.c index 233ee9a65..21e8d01cc 100644 --- a/src/tss2-sys/api/Tss2_Sys_ActivateCredential.c +++ b/src/tss2-sys/api/Tss2_Sys_ActivateCredential.c @@ -21,7 +21,7 @@ TSS2_RC Tss2_Sys_ActivateCredential_Prepare( const TPM2B_ID_OBJECT *credentialBlob, const TPM2B_ENCRYPTED_SECRET *secret) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -87,7 +87,7 @@ TSS2_RC Tss2_Sys_ActivateCredential_Complete( TSS2_SYS_CONTEXT *sysContext, TPM2B_DIGEST *certInfo) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -114,7 +114,7 @@ TSS2_RC Tss2_Sys_ActivateCredential( TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { TSS2_RC rval; - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); rval = Tss2_Sys_ActivateCredential_Prepare(sysContext, activateHandle, keyHandle, credentialBlob, diff --git a/src/tss2-sys/api/Tss2_Sys_Certify.c b/src/tss2-sys/api/Tss2_Sys_Certify.c index a0fe66e1a..e7b78566a 100644 --- a/src/tss2-sys/api/Tss2_Sys_Certify.c +++ b/src/tss2-sys/api/Tss2_Sys_Certify.c @@ -21,7 +21,7 @@ TSS2_RC Tss2_Sys_Certify_Prepare( const TPM2B_DATA *qualifyingData, const TPMT_SIG_SCHEME *inScheme) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !inScheme) @@ -76,7 +76,7 @@ TSS2_RC Tss2_Sys_Certify_Complete( TPM2B_ATTEST *certifyInfo, TPMT_SIGNATURE *signature) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -111,7 +111,7 @@ TSS2_RC Tss2_Sys_Certify( TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { TSS2_RC rval; - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!inScheme) return TSS2_SYS_RC_BAD_REFERENCE; diff --git a/src/tss2-sys/api/Tss2_Sys_CertifyCreation.c b/src/tss2-sys/api/Tss2_Sys_CertifyCreation.c index b807143fb..7b072029d 100644 --- a/src/tss2-sys/api/Tss2_Sys_CertifyCreation.c +++ b/src/tss2-sys/api/Tss2_Sys_CertifyCreation.c @@ -25,7 +25,7 @@ TSS2_RC Tss2_Sys_CertifyCreation_Prepare( const TPMT_SIG_SCHEME *inScheme, const TPMT_TK_CREATION *creationTicket) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !inScheme || !creationTicket) @@ -93,7 +93,7 @@ TSS2_RC Tss2_Sys_CertifyCreation_Complete( TPM2B_ATTEST *certifyInfo, TPMT_SIGNATURE *signature) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -129,7 +129,7 @@ TSS2_RC Tss2_Sys_CertifyCreation( TPMT_SIGNATURE *signature, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if( inScheme == NULL || creationTicket == NULL ) diff --git a/src/tss2-sys/api/Tss2_Sys_CertifyX509.c b/src/tss2-sys/api/Tss2_Sys_CertifyX509.c index 5c30a3994..95bec7e0d 100644 --- a/src/tss2-sys/api/Tss2_Sys_CertifyX509.c +++ b/src/tss2-sys/api/Tss2_Sys_CertifyX509.c @@ -22,7 +22,7 @@ TSS2_RC Tss2_Sys_CertifyX509_Prepare( const TPMT_SIG_SCHEME *inScheme, const TPM2B_MAX_BUFFER *partialCertificate) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !reserved || !inScheme || !partialCertificate) @@ -74,7 +74,7 @@ TSS2_RC Tss2_Sys_CertifyX509_Complete( TPM2B_DIGEST *tbsDigest, TPMT_SIGNATURE *signature) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -117,7 +117,7 @@ TSS2_RC Tss2_Sys_CertifyX509( TPMT_SIGNATURE *signature, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_CertifyX509_Prepare(sysContext, objectHandle, signHandle, diff --git a/src/tss2-sys/api/Tss2_Sys_ChangeEPS.c b/src/tss2-sys/api/Tss2_Sys_ChangeEPS.c index 11bb6a311..98532e1d2 100644 --- a/src/tss2-sys/api/Tss2_Sys_ChangeEPS.c +++ b/src/tss2-sys/api/Tss2_Sys_ChangeEPS.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_ChangeEPS_Prepare( TSS2_SYS_CONTEXT *sysContext, TPMI_RH_PLATFORM authHandle) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -44,7 +44,7 @@ TSS2_RC Tss2_Sys_ChangeEPS_Prepare( TSS2_RC Tss2_Sys_ChangeEPS_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -58,7 +58,7 @@ TSS2_RC Tss2_Sys_ChangeEPS( TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_ChangeEPS_Prepare(sysContext, authHandle); diff --git a/src/tss2-sys/api/Tss2_Sys_ChangePPS.c b/src/tss2-sys/api/Tss2_Sys_ChangePPS.c index 731a7a12e..9b271d600 100644 --- a/src/tss2-sys/api/Tss2_Sys_ChangePPS.c +++ b/src/tss2-sys/api/Tss2_Sys_ChangePPS.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_ChangePPS_Prepare( TSS2_SYS_CONTEXT *sysContext, TPMI_RH_PLATFORM authHandle) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -44,7 +44,7 @@ TSS2_RC Tss2_Sys_ChangePPS_Prepare( TSS2_RC Tss2_Sys_ChangePPS_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -58,7 +58,7 @@ TSS2_RC Tss2_Sys_ChangePPS( TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_ChangePPS_Prepare(sysContext, authHandle); diff --git a/src/tss2-sys/api/Tss2_Sys_Clear.c b/src/tss2-sys/api/Tss2_Sys_Clear.c index 19feeff27..406803eb2 100644 --- a/src/tss2-sys/api/Tss2_Sys_Clear.c +++ b/src/tss2-sys/api/Tss2_Sys_Clear.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_Clear_Prepare( TSS2_SYS_CONTEXT *sysContext, TPMI_RH_CLEAR authHandle) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -44,7 +44,7 @@ TSS2_RC Tss2_Sys_Clear_Prepare( TSS2_RC Tss2_Sys_Clear_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -58,7 +58,7 @@ TSS2_RC Tss2_Sys_Clear( TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_Clear_Prepare(sysContext, authHandle); diff --git a/src/tss2-sys/api/Tss2_Sys_ClearControl.c b/src/tss2-sys/api/Tss2_Sys_ClearControl.c index e97bd6f8f..7bb134890 100644 --- a/src/tss2-sys/api/Tss2_Sys_ClearControl.c +++ b/src/tss2-sys/api/Tss2_Sys_ClearControl.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_ClearControl_Prepare( TPMI_RH_CLEAR auth, TPMI_YES_NO disable) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -51,7 +51,7 @@ TSS2_RC Tss2_Sys_ClearControl_Prepare( TSS2_RC Tss2_Sys_ClearControl_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -66,7 +66,7 @@ TSS2_RC Tss2_Sys_ClearControl( TPMI_YES_NO disable, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_ClearControl_Prepare(sysContext, auth, disable); diff --git a/src/tss2-sys/api/Tss2_Sys_ClockRateAdjust.c b/src/tss2-sys/api/Tss2_Sys_ClockRateAdjust.c index af12201d7..98b06bd73 100644 --- a/src/tss2-sys/api/Tss2_Sys_ClockRateAdjust.c +++ b/src/tss2-sys/api/Tss2_Sys_ClockRateAdjust.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_ClockRateAdjust_Prepare( TPMI_RH_PROVISION auth, TPM2_CLOCK_ADJUST rateAdjust) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -50,7 +50,7 @@ TSS2_RC Tss2_Sys_ClockRateAdjust_Prepare( TSS2_RC Tss2_Sys_ClockRateAdjust_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -65,7 +65,7 @@ TSS2_RC Tss2_Sys_ClockRateAdjust( TPM2_CLOCK_ADJUST rateAdjust, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_ClockRateAdjust_Prepare(sysContext, auth, rateAdjust); diff --git a/src/tss2-sys/api/Tss2_Sys_ClockSet.c b/src/tss2-sys/api/Tss2_Sys_ClockSet.c index 8f0e47c8f..bcc9759e2 100644 --- a/src/tss2-sys/api/Tss2_Sys_ClockSet.c +++ b/src/tss2-sys/api/Tss2_Sys_ClockSet.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_ClockSet_Prepare( TPMI_RH_PROVISION auth, UINT64 newTime) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -50,7 +50,7 @@ TSS2_RC Tss2_Sys_ClockSet_Prepare( TSS2_RC Tss2_Sys_ClockSet_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -65,7 +65,7 @@ TSS2_RC Tss2_Sys_ClockSet( UINT64 newTime, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_ClockSet_Prepare(sysContext, auth, newTime); diff --git a/src/tss2-sys/api/Tss2_Sys_Commit.c b/src/tss2-sys/api/Tss2_Sys_Commit.c index c953c44d5..76a47aea4 100644 --- a/src/tss2-sys/api/Tss2_Sys_Commit.c +++ b/src/tss2-sys/api/Tss2_Sys_Commit.c @@ -21,7 +21,7 @@ TSS2_RC Tss2_Sys_Commit_Prepare( const TPM2B_SENSITIVE_DATA *s2, const TPM2B_ECC_PARAMETER *y2) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -96,7 +96,7 @@ TSS2_RC Tss2_Sys_Commit_Complete( TPM2B_ECC_POINT *E, UINT16 *counter) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -142,7 +142,7 @@ TSS2_RC Tss2_Sys_Commit( UINT16 *counter, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_Commit_Prepare(sysContext, signHandle, P1, s2, y2); diff --git a/src/tss2-sys/api/Tss2_Sys_ContextLoad.c b/src/tss2-sys/api/Tss2_Sys_ContextLoad.c index cc3a9f419..1dffb85f1 100644 --- a/src/tss2-sys/api/Tss2_Sys_ContextLoad.c +++ b/src/tss2-sys/api/Tss2_Sys_ContextLoad.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_ContextLoad_Prepare( TSS2_SYS_CONTEXT *sysContext, const TPMS_CONTEXT *context) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !context) @@ -45,7 +45,7 @@ TSS2_RC Tss2_Sys_ContextLoad_Complete( TSS2_SYS_CONTEXT *sysContext, TPMI_DH_CONTEXT *loadedHandle) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -66,7 +66,7 @@ TSS2_RC Tss2_Sys_ContextLoad( const TPMS_CONTEXT *context, TPMI_DH_CONTEXT *loadedHandle) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!context) diff --git a/src/tss2-sys/api/Tss2_Sys_ContextSave.c b/src/tss2-sys/api/Tss2_Sys_ContextSave.c index 03bcba16e..7b7700f13 100644 --- a/src/tss2-sys/api/Tss2_Sys_ContextSave.c +++ b/src/tss2-sys/api/Tss2_Sys_ContextSave.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_ContextSave_Prepare( TSS2_SYS_CONTEXT *sysContext, TPMI_DH_CONTEXT saveHandle) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -45,7 +45,7 @@ TSS2_RC Tss2_Sys_ContextSave_Complete( TSS2_SYS_CONTEXT *sysContext, TPMS_CONTEXT *context) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -66,7 +66,7 @@ TSS2_RC Tss2_Sys_ContextSave( TPMI_DH_CONTEXT saveHandle, TPMS_CONTEXT *context) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_ContextSave_Prepare(sysContext, saveHandle); diff --git a/src/tss2-sys/api/Tss2_Sys_Create.c b/src/tss2-sys/api/Tss2_Sys_Create.c index fd4a5f567..6e0dfd7e3 100644 --- a/src/tss2-sys/api/Tss2_Sys_Create.c +++ b/src/tss2-sys/api/Tss2_Sys_Create.c @@ -22,7 +22,7 @@ TSS2_RC Tss2_Sys_Create_Prepare( const TPM2B_DATA *outsideInfo, const TPML_PCR_SELECTION *creationPCR) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !creationPCR) @@ -116,7 +116,7 @@ TSS2_RC Tss2_Sys_Create_Complete( TPM2B_DIGEST *creationHash, TPMT_TK_CREATION *creationTicket) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -175,7 +175,7 @@ TSS2_RC Tss2_Sys_Create( TPMT_TK_CREATION *creationTicket, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!creationPCR) diff --git a/src/tss2-sys/api/Tss2_Sys_CreateLoaded.c b/src/tss2-sys/api/Tss2_Sys_CreateLoaded.c index 60ea2136c..0dfeb4648 100644 --- a/src/tss2-sys/api/Tss2_Sys_CreateLoaded.c +++ b/src/tss2-sys/api/Tss2_Sys_CreateLoaded.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_CreateLoaded_Prepare( const TPM2B_SENSITIVE_CREATE *inSensitive, const TPM2B_TEMPLATE *inPublic) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -76,7 +76,7 @@ TSS2_RC Tss2_Sys_CreateLoaded_Complete( TPM2B_PUBLIC *outPublic, TPM2B_NAME *name) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -122,7 +122,7 @@ TSS2_RC Tss2_Sys_CreateLoaded( TPM2B_NAME *name, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !objectHandle || !outPrivate || !outPublic || !name) diff --git a/src/tss2-sys/api/Tss2_Sys_CreatePrimary.c b/src/tss2-sys/api/Tss2_Sys_CreatePrimary.c index 92d95da6f..d838c7343 100644 --- a/src/tss2-sys/api/Tss2_Sys_CreatePrimary.c +++ b/src/tss2-sys/api/Tss2_Sys_CreatePrimary.c @@ -22,7 +22,7 @@ TSS2_RC Tss2_Sys_CreatePrimary_Prepare( const TPM2B_DATA *outsideInfo, const TPML_PCR_SELECTION *creationPCR) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -115,7 +115,7 @@ TSS2_RC Tss2_Sys_CreatePrimary_Complete( TPMT_TK_CREATION *creationTicket, TPM2B_NAME *name) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -180,7 +180,7 @@ TSS2_RC Tss2_Sys_CreatePrimary( TPM2B_NAME *name, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !creationPCR) diff --git a/src/tss2-sys/api/Tss2_Sys_DictionaryAttackLockReset.c b/src/tss2-sys/api/Tss2_Sys_DictionaryAttackLockReset.c index f81e5987f..c6659d7cf 100644 --- a/src/tss2-sys/api/Tss2_Sys_DictionaryAttackLockReset.c +++ b/src/tss2-sys/api/Tss2_Sys_DictionaryAttackLockReset.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_DictionaryAttackLockReset_Prepare( TSS2_SYS_CONTEXT *sysContext, TPMI_RH_LOCKOUT lockHandle) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -44,7 +44,7 @@ TSS2_RC Tss2_Sys_DictionaryAttackLockReset_Prepare( TSS2_RC Tss2_Sys_DictionaryAttackLockReset_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -58,7 +58,7 @@ TSS2_RC Tss2_Sys_DictionaryAttackLockReset( TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_DictionaryAttackLockReset_Prepare(sysContext, lockHandle); diff --git a/src/tss2-sys/api/Tss2_Sys_DictionaryAttackParameters.c b/src/tss2-sys/api/Tss2_Sys_DictionaryAttackParameters.c index 1a3abd8cb..abfe71227 100644 --- a/src/tss2-sys/api/Tss2_Sys_DictionaryAttackParameters.c +++ b/src/tss2-sys/api/Tss2_Sys_DictionaryAttackParameters.c @@ -21,7 +21,7 @@ TSS2_RC Tss2_Sys_DictionaryAttackParameters_Prepare( UINT32 newRecoveryTime, UINT32 lockoutRecovery) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -64,7 +64,7 @@ TSS2_RC Tss2_Sys_DictionaryAttackParameters_Prepare( TSS2_RC Tss2_Sys_DictionaryAttackParameters_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -81,7 +81,7 @@ TSS2_RC Tss2_Sys_DictionaryAttackParameters( UINT32 lockoutRecovery, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_DictionaryAttackParameters_Prepare(sysContext, lockHandle, newMaxTries, newRecoveryTime, diff --git a/src/tss2-sys/api/Tss2_Sys_Duplicate.c b/src/tss2-sys/api/Tss2_Sys_Duplicate.c index 7f16f7628..9f2234335 100644 --- a/src/tss2-sys/api/Tss2_Sys_Duplicate.c +++ b/src/tss2-sys/api/Tss2_Sys_Duplicate.c @@ -21,7 +21,7 @@ TSS2_RC Tss2_Sys_Duplicate_Prepare( const TPM2B_DATA *encryptionKeyIn, const TPMT_SYM_DEF_OBJECT *symmetricAlg) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !symmetricAlg) @@ -79,7 +79,7 @@ TSS2_RC Tss2_Sys_Duplicate_Complete( TPM2B_PRIVATE *duplicate, TPM2B_ENCRYPTED_SECRET *outSymSeed) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -121,7 +121,7 @@ TSS2_RC Tss2_Sys_Duplicate( TPM2B_ENCRYPTED_SECRET *outSymSeed, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!symmetricAlg) diff --git a/src/tss2-sys/api/Tss2_Sys_ECC_Parameters.c b/src/tss2-sys/api/Tss2_Sys_ECC_Parameters.c index 57f11ae55..1fac75caa 100644 --- a/src/tss2-sys/api/Tss2_Sys_ECC_Parameters.c +++ b/src/tss2-sys/api/Tss2_Sys_ECC_Parameters.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_ECC_Parameters_Prepare( TSS2_SYS_CONTEXT *sysContext, TPMI_ECC_CURVE curveID) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -45,7 +45,7 @@ TSS2_RC Tss2_Sys_ECC_Parameters_Complete( TSS2_SYS_CONTEXT *sysContext, TPMS_ALGORITHM_DETAIL_ECC *parameters) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -68,7 +68,7 @@ TSS2_RC Tss2_Sys_ECC_Parameters( TPMS_ALGORITHM_DETAIL_ECC *parameters, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_ECC_Parameters_Prepare(sysContext, curveID); diff --git a/src/tss2-sys/api/Tss2_Sys_ECDH_KeyGen.c b/src/tss2-sys/api/Tss2_Sys_ECDH_KeyGen.c index e8993c45e..5285907bf 100644 --- a/src/tss2-sys/api/Tss2_Sys_ECDH_KeyGen.c +++ b/src/tss2-sys/api/Tss2_Sys_ECDH_KeyGen.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_ECDH_KeyGen_Prepare( TSS2_SYS_CONTEXT *sysContext, TPMI_DH_OBJECT keyHandle) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -46,7 +46,7 @@ TSS2_RC Tss2_Sys_ECDH_KeyGen_Complete( TPM2B_ECC_POINT *zPoint, TPM2B_ECC_POINT *pubPoint) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -77,7 +77,7 @@ TSS2_RC Tss2_Sys_ECDH_KeyGen( TPM2B_ECC_POINT *pubPoint, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_ECDH_KeyGen_Prepare(sysContext, keyHandle); diff --git a/src/tss2-sys/api/Tss2_Sys_ECDH_ZGen.c b/src/tss2-sys/api/Tss2_Sys_ECDH_ZGen.c index b6b03dc1c..105d66967 100644 --- a/src/tss2-sys/api/Tss2_Sys_ECDH_ZGen.c +++ b/src/tss2-sys/api/Tss2_Sys_ECDH_ZGen.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_ECDH_ZGen_Prepare( TPMI_DH_OBJECT keyHandle, const TPM2B_ECC_POINT *inPoint) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -61,7 +61,7 @@ TSS2_RC Tss2_Sys_ECDH_ZGen_Complete( TSS2_SYS_CONTEXT *sysContext, TPM2B_ECC_POINT *outPoint) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -85,7 +85,7 @@ TSS2_RC Tss2_Sys_ECDH_ZGen( TPM2B_ECC_POINT *outPoint, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_ECDH_ZGen_Prepare(sysContext, keyHandle, inPoint); diff --git a/src/tss2-sys/api/Tss2_Sys_EC_Ephemeral.c b/src/tss2-sys/api/Tss2_Sys_EC_Ephemeral.c index 35b9eaa10..0479483e3 100644 --- a/src/tss2-sys/api/Tss2_Sys_EC_Ephemeral.c +++ b/src/tss2-sys/api/Tss2_Sys_EC_Ephemeral.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_EC_Ephemeral_Prepare( TSS2_SYS_CONTEXT *sysContext, TPMI_ECC_CURVE curveID) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -46,7 +46,7 @@ TSS2_RC Tss2_Sys_EC_Ephemeral_Complete( TPM2B_ECC_POINT *Q, UINT16 *counter) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -74,7 +74,7 @@ TSS2_RC Tss2_Sys_EC_Ephemeral( UINT16 *counter, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_EC_Ephemeral_Prepare(sysContext, curveID); diff --git a/src/tss2-sys/api/Tss2_Sys_EncryptDecrypt.c b/src/tss2-sys/api/Tss2_Sys_EncryptDecrypt.c index 71ee88f43..3f3b2c6b7 100644 --- a/src/tss2-sys/api/Tss2_Sys_EncryptDecrypt.c +++ b/src/tss2-sys/api/Tss2_Sys_EncryptDecrypt.c @@ -22,7 +22,7 @@ TSS2_RC Tss2_Sys_EncryptDecrypt_Prepare( const TPM2B_IV *ivIn, const TPM2B_MAX_BUFFER *inData) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -92,7 +92,7 @@ TSS2_RC Tss2_Sys_EncryptDecrypt_Complete( TPM2B_MAX_BUFFER *outData, TPM2B_IV *ivOut) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -127,7 +127,7 @@ TSS2_RC Tss2_Sys_EncryptDecrypt( TPM2B_IV *ivOut, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_EncryptDecrypt_Prepare(sysContext, keyHandle, decrypt, diff --git a/src/tss2-sys/api/Tss2_Sys_EncryptDecrypt2.c b/src/tss2-sys/api/Tss2_Sys_EncryptDecrypt2.c index 42fc633e4..446d37b18 100644 --- a/src/tss2-sys/api/Tss2_Sys_EncryptDecrypt2.c +++ b/src/tss2-sys/api/Tss2_Sys_EncryptDecrypt2.c @@ -22,7 +22,7 @@ TSS2_RC Tss2_Sys_EncryptDecrypt2_Prepare ( TPMI_ALG_CIPHER_MODE mode, const TPM2B_IV *ivIn) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -97,7 +97,7 @@ TSS2_RC Tss2_Sys_EncryptDecrypt2_Complete ( TPM2B_MAX_BUFFER *outData, TPM2B_IV *ivOut) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -132,7 +132,7 @@ TSS2_RC Tss2_Sys_EncryptDecrypt2 ( TPM2B_IV *ivOut, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_EncryptDecrypt2_Prepare (sysContext, diff --git a/src/tss2-sys/api/Tss2_Sys_EventSequenceComplete.c b/src/tss2-sys/api/Tss2_Sys_EventSequenceComplete.c index c71b8b862..f249f471a 100644 --- a/src/tss2-sys/api/Tss2_Sys_EventSequenceComplete.c +++ b/src/tss2-sys/api/Tss2_Sys_EventSequenceComplete.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_EventSequenceComplete_Prepare( TPMI_DH_OBJECT sequenceHandle, const TPM2B_MAX_BUFFER *buffer) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -68,7 +68,7 @@ TSS2_RC Tss2_Sys_EventSequenceComplete_Complete( TSS2_SYS_CONTEXT *sysContext, TPML_DIGEST_VALUES *results) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -92,7 +92,7 @@ TSS2_RC Tss2_Sys_EventSequenceComplete( TPML_DIGEST_VALUES *results, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_EventSequenceComplete_Prepare(sysContext, pcrHandle, diff --git a/src/tss2-sys/api/Tss2_Sys_EvictControl.c b/src/tss2-sys/api/Tss2_Sys_EvictControl.c index 7bdcc859e..22b447f95 100644 --- a/src/tss2-sys/api/Tss2_Sys_EvictControl.c +++ b/src/tss2-sys/api/Tss2_Sys_EvictControl.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_EvictControl_Prepare( TPMI_DH_OBJECT objectHandle, TPMI_DH_PERSISTENT persistentHandle) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -58,7 +58,7 @@ TSS2_RC Tss2_Sys_EvictControl_Prepare( TSS2_RC Tss2_Sys_EvictControl_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -74,7 +74,7 @@ TSS2_RC Tss2_Sys_EvictControl( TPMI_DH_PERSISTENT persistentHandle, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_EvictControl_Prepare(sysContext, auth, objectHandle, diff --git a/src/tss2-sys/api/Tss2_Sys_Execute.c b/src/tss2-sys/api/Tss2_Sys_Execute.c index 9361ff35a..ab6525d14 100644 --- a/src/tss2-sys/api/Tss2_Sys_Execute.c +++ b/src/tss2-sys/api/Tss2_Sys_Execute.c @@ -24,7 +24,7 @@ TSS2_RC Tss2_Sys_ExecuteAsync(TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -51,7 +51,7 @@ TSS2_RC Tss2_Sys_ExecuteAsync(TSS2_SYS_CONTEXT *sysContext) TSS2_RC Tss2_Sys_ExecuteFinish(TSS2_SYS_CONTEXT *sysContext, int32_t timeout) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; size_t response_size = 0; diff --git a/src/tss2-sys/api/Tss2_Sys_FieldUpgradeData.c b/src/tss2-sys/api/Tss2_Sys_FieldUpgradeData.c index a6cd86328..ea485f4e0 100644 --- a/src/tss2-sys/api/Tss2_Sys_FieldUpgradeData.c +++ b/src/tss2-sys/api/Tss2_Sys_FieldUpgradeData.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_FieldUpgradeData_Prepare( TSS2_SYS_CONTEXT *sysContext, TPM2B_MAX_BUFFER const *fuData) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -56,7 +56,7 @@ TSS2_RC Tss2_Sys_FieldUpgradeData_Complete( TPMT_HA *nextDigest, TPMT_HA *firstDigest) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -87,7 +87,7 @@ TSS2_RC Tss2_Sys_FieldUpgradeData( TPMT_HA *firstDigest, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_FieldUpgradeData_Prepare(sysContext, fuData); diff --git a/src/tss2-sys/api/Tss2_Sys_FieldUpgradeStart.c b/src/tss2-sys/api/Tss2_Sys_FieldUpgradeStart.c index 5e68b9b68..bce5c0139 100644 --- a/src/tss2-sys/api/Tss2_Sys_FieldUpgradeStart.c +++ b/src/tss2-sys/api/Tss2_Sys_FieldUpgradeStart.c @@ -21,7 +21,7 @@ TSS2_RC Tss2_Sys_FieldUpgradeStart_Prepare( TPM2B_DIGEST const *fuDigest, TPMT_SIGNATURE const *manifestSignature) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !manifestSignature) @@ -75,7 +75,7 @@ TSS2_RC Tss2_Sys_FieldUpgradeStart_Prepare( TSS2_RC Tss2_Sys_FieldUpgradeStart_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -92,7 +92,7 @@ TSS2_RC Tss2_Sys_FieldUpgradeStart( TPMT_SIGNATURE const *manifestSignature, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!manifestSignature) diff --git a/src/tss2-sys/api/Tss2_Sys_FirmwareRead.c b/src/tss2-sys/api/Tss2_Sys_FirmwareRead.c index 05212ef4c..330a7d4e0 100644 --- a/src/tss2-sys/api/Tss2_Sys_FirmwareRead.c +++ b/src/tss2-sys/api/Tss2_Sys_FirmwareRead.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_FirmwareRead_Prepare( TSS2_SYS_CONTEXT *sysContext, UINT32 sequenceNumber) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -45,7 +45,7 @@ TSS2_RC Tss2_Sys_FirmwareRead_Complete( TSS2_SYS_CONTEXT *sysContext, TPM2B_MAX_BUFFER *fuData) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -67,7 +67,7 @@ TSS2_RC Tss2_Sys_FirmwareRead( TPM2B_MAX_BUFFER *fuData, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_FirmwareRead_Prepare(sysContext, sequenceNumber); diff --git a/src/tss2-sys/api/Tss2_Sys_FlushContext.c b/src/tss2-sys/api/Tss2_Sys_FlushContext.c index 32dc9fb09..213991fac 100644 --- a/src/tss2-sys/api/Tss2_Sys_FlushContext.c +++ b/src/tss2-sys/api/Tss2_Sys_FlushContext.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_FlushContext_Prepare( TSS2_SYS_CONTEXT *sysContext, TPMI_DH_CONTEXT flushHandle) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -43,7 +43,7 @@ TSS2_RC Tss2_Sys_FlushContext_Prepare( TSS2_RC Tss2_Sys_FlushContext_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -55,7 +55,7 @@ TSS2_RC Tss2_Sys_FlushContext( TSS2_SYS_CONTEXT *sysContext, TPMI_DH_CONTEXT flushHandle) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_FlushContext_Prepare(sysContext, flushHandle); diff --git a/src/tss2-sys/api/Tss2_Sys_GetCapability.c b/src/tss2-sys/api/Tss2_Sys_GetCapability.c index a5ac73e65..e8f9d9475 100644 --- a/src/tss2-sys/api/Tss2_Sys_GetCapability.c +++ b/src/tss2-sys/api/Tss2_Sys_GetCapability.c @@ -22,7 +22,7 @@ TSS2_RC Tss2_Sys_GetCapability_Prepare( UINT32 property, UINT32 propertyCount) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -62,7 +62,7 @@ TSS2_RC Tss2_Sys_GetCapability_Complete( TPMI_YES_NO *moreData, TPMS_CAPABILITY_DATA *capabilityData) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; TPM2_CAP cap; @@ -137,7 +137,7 @@ TSS2_RC Tss2_Sys_GetCapability( TPMS_CAPABILITY_DATA *capabilityData, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_GetCapability_Prepare(sysContext, capability, property, diff --git a/src/tss2-sys/api/Tss2_Sys_GetCommandAuditDigest.c b/src/tss2-sys/api/Tss2_Sys_GetCommandAuditDigest.c index dda22075e..ef71d6024 100644 --- a/src/tss2-sys/api/Tss2_Sys_GetCommandAuditDigest.c +++ b/src/tss2-sys/api/Tss2_Sys_GetCommandAuditDigest.c @@ -21,7 +21,7 @@ TSS2_RC Tss2_Sys_GetCommandAuditDigest_Prepare( const TPM2B_DATA *qualifyingData, const TPMT_SIG_SCHEME *inScheme) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !inScheme) @@ -77,7 +77,7 @@ TSS2_RC Tss2_Sys_GetCommandAuditDigest_Complete( TPM2B_ATTEST *auditInfo, TPMT_SIGNATURE *signature) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -109,7 +109,7 @@ TSS2_RC Tss2_Sys_GetCommandAuditDigest( TPMT_SIGNATURE *signature, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!inScheme) diff --git a/src/tss2-sys/api/Tss2_Sys_GetCommandCode.c b/src/tss2-sys/api/Tss2_Sys_GetCommandCode.c index e0e8c0cde..d8016aa5b 100644 --- a/src/tss2-sys/api/Tss2_Sys_GetCommandCode.c +++ b/src/tss2-sys/api/Tss2_Sys_GetCommandCode.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_GetCommandCode( TSS2_SYS_CONTEXT *sysContext, UINT8 *commandCode) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx || !commandCode) return TSS2_SYS_RC_BAD_REFERENCE; diff --git a/src/tss2-sys/api/Tss2_Sys_GetContextSize.c b/src/tss2-sys/api/Tss2_Sys_GetContextSize.c index 5a9440bba..8df1c53c8 100644 --- a/src/tss2-sys/api/Tss2_Sys_GetContextSize.c +++ b/src/tss2-sys/api/Tss2_Sys_GetContextSize.c @@ -17,9 +17,9 @@ size_t Tss2_Sys_GetContextSize(size_t maxCommandSize) { if (maxCommandSize == 0) { - return sizeof(_TSS2_SYS_CONTEXT_BLOB) + TPM2_MAX_COMMAND_SIZE; + return sizeof(TSS2_SYS_CONTEXT_BLOB) + TPM2_MAX_COMMAND_SIZE; } else { - return sizeof(_TSS2_SYS_CONTEXT_BLOB) + + return sizeof(TSS2_SYS_CONTEXT_BLOB) + ((maxCommandSize > sizeof(TPM20_Header_In)) ? maxCommandSize : sizeof(TPM20_Header_In)); } diff --git a/src/tss2-sys/api/Tss2_Sys_GetCpBuffer.c b/src/tss2-sys/api/Tss2_Sys_GetCpBuffer.c index d2fdd142e..9e2a6d828 100644 --- a/src/tss2-sys/api/Tss2_Sys_GetCpBuffer.c +++ b/src/tss2-sys/api/Tss2_Sys_GetCpBuffer.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_GetCpBuffer( size_t *cpBufferUsedSize, const uint8_t **cpBuffer) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx || !cpBufferUsedSize || !cpBuffer) return TSS2_SYS_RC_BAD_REFERENCE; diff --git a/src/tss2-sys/api/Tss2_Sys_GetDecryptParam.c b/src/tss2-sys/api/Tss2_Sys_GetDecryptParam.c index 4fb9f7946..e5d540890 100644 --- a/src/tss2-sys/api/Tss2_Sys_GetDecryptParam.c +++ b/src/tss2-sys/api/Tss2_Sys_GetDecryptParam.c @@ -22,7 +22,7 @@ TSS2_RC Tss2_Sys_GetDecryptParam( size_t *decryptParamSize, const uint8_t **decryptParamBuffer) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TPM2B *decryptParam; if (!decryptParamSize || !decryptParamBuffer || !ctx) diff --git a/src/tss2-sys/api/Tss2_Sys_GetEncryptParam.c b/src/tss2-sys/api/Tss2_Sys_GetEncryptParam.c index f30abff75..2fbc8f0f5 100644 --- a/src/tss2-sys/api/Tss2_Sys_GetEncryptParam.c +++ b/src/tss2-sys/api/Tss2_Sys_GetEncryptParam.c @@ -22,7 +22,7 @@ TSS2_RC Tss2_Sys_GetEncryptParam( size_t *encryptParamSize, const uint8_t **encryptParamBuffer) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); uint8_t *offset; if (!encryptParamSize || !encryptParamBuffer || !ctx) diff --git a/src/tss2-sys/api/Tss2_Sys_GetRandom.c b/src/tss2-sys/api/Tss2_Sys_GetRandom.c index 581d24315..ee430d1ef 100644 --- a/src/tss2-sys/api/Tss2_Sys_GetRandom.c +++ b/src/tss2-sys/api/Tss2_Sys_GetRandom.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_GetRandom_Prepare( TSS2_SYS_CONTEXT *sysContext, UINT16 bytesRequested) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -44,7 +44,7 @@ TSS2_RC Tss2_Sys_GetRandom_Complete( TSS2_SYS_CONTEXT *sysContext, TPM2B_DIGEST *randomBytes) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -66,7 +66,7 @@ TSS2_RC Tss2_Sys_GetRandom( TPM2B_DIGEST *randomBytes, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_GetRandom_Prepare(sysContext, bytesRequested); diff --git a/src/tss2-sys/api/Tss2_Sys_GetRpBuffer.c b/src/tss2-sys/api/Tss2_Sys_GetRpBuffer.c index 27f035932..af37aa08f 100644 --- a/src/tss2-sys/api/Tss2_Sys_GetRpBuffer.c +++ b/src/tss2-sys/api/Tss2_Sys_GetRpBuffer.c @@ -22,7 +22,7 @@ TSS2_RC Tss2_Sys_GetRpBuffer( size_t *rpBufferUsedSize, const uint8_t **rpBuffer) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !rpBufferUsedSize || !rpBuffer) diff --git a/src/tss2-sys/api/Tss2_Sys_GetRspAuths.c b/src/tss2-sys/api/Tss2_Sys_GetRspAuths.c index 313416781..8f1cb5606 100644 --- a/src/tss2-sys/api/Tss2_Sys_GetRspAuths.c +++ b/src/tss2-sys/api/Tss2_Sys_GetRspAuths.c @@ -22,7 +22,7 @@ TSS2_RC Tss2_Sys_GetRspAuths( TSS2_SYS_CONTEXT *sysContext, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval = TSS2_RC_SUCCESS; size_t offset = 0, offset_tmp; unsigned i = 0; diff --git a/src/tss2-sys/api/Tss2_Sys_GetSessionAuditDigest.c b/src/tss2-sys/api/Tss2_Sys_GetSessionAuditDigest.c index 9214775c4..cb4b45948 100644 --- a/src/tss2-sys/api/Tss2_Sys_GetSessionAuditDigest.c +++ b/src/tss2-sys/api/Tss2_Sys_GetSessionAuditDigest.c @@ -22,7 +22,7 @@ TSS2_RC Tss2_Sys_GetSessionAuditDigest_Prepare( const TPM2B_DATA *qualifyingData, const TPMT_SIG_SCHEME *inScheme) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !inScheme) @@ -84,7 +84,7 @@ TSS2_RC Tss2_Sys_GetSessionAuditDigest_Complete( TPM2B_ATTEST *auditInfo, TPMT_SIGNATURE *signature) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -117,7 +117,7 @@ TSS2_RC Tss2_Sys_GetSessionAuditDigest( TPMT_SIGNATURE *signature, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!inScheme) diff --git a/src/tss2-sys/api/Tss2_Sys_GetTctiContext.c b/src/tss2-sys/api/Tss2_Sys_GetTctiContext.c index 0bf59aac4..f7c38eae2 100644 --- a/src/tss2-sys/api/Tss2_Sys_GetTctiContext.c +++ b/src/tss2-sys/api/Tss2_Sys_GetTctiContext.c @@ -17,7 +17,7 @@ TSS2_RC Tss2_Sys_GetTctiContext( TSS2_SYS_CONTEXT *sysContext, TSS2_TCTI_CONTEXT **tctiContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx || !tctiContext) return TSS2_SYS_RC_BAD_REFERENCE; diff --git a/src/tss2-sys/api/Tss2_Sys_GetTestResult.c b/src/tss2-sys/api/Tss2_Sys_GetTestResult.c index 797882dbf..65a26a8c0 100644 --- a/src/tss2-sys/api/Tss2_Sys_GetTestResult.c +++ b/src/tss2-sys/api/Tss2_Sys_GetTestResult.c @@ -17,7 +17,7 @@ TSS2_RC Tss2_Sys_GetTestResult_Prepare( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -39,7 +39,7 @@ TSS2_RC Tss2_Sys_GetTestResult_Complete( TPM2B_MAX_BUFFER *outData, TSS2_RC *testResult) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -69,7 +69,7 @@ TSS2_RC Tss2_Sys_GetTestResult( TSS2_RC *testResult, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_GetTestResult_Prepare(sysContext); diff --git a/src/tss2-sys/api/Tss2_Sys_GetTime.c b/src/tss2-sys/api/Tss2_Sys_GetTime.c index 969bde94f..ef0dfabec 100644 --- a/src/tss2-sys/api/Tss2_Sys_GetTime.c +++ b/src/tss2-sys/api/Tss2_Sys_GetTime.c @@ -21,7 +21,7 @@ TSS2_RC Tss2_Sys_GetTime_Prepare( const TPM2B_DATA *qualifyingData, const TPMT_SIG_SCHEME *inScheme) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !inScheme) @@ -76,7 +76,7 @@ TSS2_RC Tss2_Sys_GetTime_Complete( TPM2B_ATTEST *timeInfo, TPMT_SIGNATURE *signature) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -110,7 +110,7 @@ TSS2_RC Tss2_Sys_GetTime( TPMT_SIGNATURE *signature, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!inScheme) diff --git a/src/tss2-sys/api/Tss2_Sys_HMAC.c b/src/tss2-sys/api/Tss2_Sys_HMAC.c index b8ea098d9..65dfb6a93 100644 --- a/src/tss2-sys/api/Tss2_Sys_HMAC.c +++ b/src/tss2-sys/api/Tss2_Sys_HMAC.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_HMAC_Prepare( const TPM2B_MAX_BUFFER *buffer, TPMI_ALG_HASH hashAlg) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -72,7 +72,7 @@ TSS2_RC Tss2_Sys_HMAC_Complete( TSS2_SYS_CONTEXT *sysContext, TPM2B_DIGEST *outHMAC) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -97,7 +97,7 @@ TSS2_RC Tss2_Sys_HMAC( TPM2B_DIGEST *outHMAC, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_HMAC_Prepare(sysContext, handle, buffer, hashAlg); diff --git a/src/tss2-sys/api/Tss2_Sys_HMAC_Start.c b/src/tss2-sys/api/Tss2_Sys_HMAC_Start.c index 46f7169e4..6ba042b61 100644 --- a/src/tss2-sys/api/Tss2_Sys_HMAC_Start.c +++ b/src/tss2-sys/api/Tss2_Sys_HMAC_Start.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_HMAC_Start_Prepare( const TPM2B_AUTH *auth, TPMI_ALG_HASH hashAlg) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -72,7 +72,7 @@ TSS2_RC Tss2_Sys_HMAC_Start_Complete( TSS2_SYS_CONTEXT *sysContext, TPMI_DH_OBJECT *sequenceHandle) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -97,7 +97,7 @@ TSS2_RC Tss2_Sys_HMAC_Start( TPMI_DH_OBJECT *sequenceHandle, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_HMAC_Start_Prepare(sysContext, handle, auth, hashAlg); diff --git a/src/tss2-sys/api/Tss2_Sys_Hash.c b/src/tss2-sys/api/Tss2_Sys_Hash.c index b3d749390..d7bcbfbd0 100644 --- a/src/tss2-sys/api/Tss2_Sys_Hash.c +++ b/src/tss2-sys/api/Tss2_Sys_Hash.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_Hash_Prepare( TPMI_ALG_HASH hashAlg, TPMI_RH_HIERARCHY hierarchy) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -73,7 +73,7 @@ TSS2_RC Tss2_Sys_Hash_Complete( TPM2B_DIGEST *outHash, TPMT_TK_HASHCHECK *validation) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -106,7 +106,7 @@ TSS2_RC Tss2_Sys_Hash( TPMT_TK_HASHCHECK *validation, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_Hash_Prepare(sysContext, data, hashAlg, hierarchy); diff --git a/src/tss2-sys/api/Tss2_Sys_HashSequenceStart.c b/src/tss2-sys/api/Tss2_Sys_HashSequenceStart.c index f61547d57..be212d212 100644 --- a/src/tss2-sys/api/Tss2_Sys_HashSequenceStart.c +++ b/src/tss2-sys/api/Tss2_Sys_HashSequenceStart.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_HashSequenceStart_Prepare( const TPM2B_AUTH *auth, TPMI_ALG_HASH hashAlg) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -65,7 +65,7 @@ TSS2_RC Tss2_Sys_HashSequenceStart_Complete( TSS2_SYS_CONTEXT *sysContext, TPMI_DH_OBJECT *sequenceHandle) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -89,7 +89,7 @@ TSS2_RC Tss2_Sys_HashSequenceStart( TPMI_DH_OBJECT *sequenceHandle, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_HashSequenceStart_Prepare(sysContext, auth, hashAlg); diff --git a/src/tss2-sys/api/Tss2_Sys_HierarchyChangeAuth.c b/src/tss2-sys/api/Tss2_Sys_HierarchyChangeAuth.c index db92b9e2c..f3a6f1cfc 100644 --- a/src/tss2-sys/api/Tss2_Sys_HierarchyChangeAuth.c +++ b/src/tss2-sys/api/Tss2_Sys_HierarchyChangeAuth.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_HierarchyChangeAuth_Prepare( TPMI_RH_HIERARCHY_AUTH authHandle, const TPM2B_AUTH *newAuth) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -60,7 +60,7 @@ TSS2_RC Tss2_Sys_HierarchyChangeAuth_Prepare( TSS2_RC Tss2_Sys_HierarchyChangeAuth_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -75,7 +75,7 @@ TSS2_RC Tss2_Sys_HierarchyChangeAuth( const TPM2B_AUTH *newAuth, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_HierarchyChangeAuth_Prepare(sysContext, authHandle, newAuth); diff --git a/src/tss2-sys/api/Tss2_Sys_HierarchyControl.c b/src/tss2-sys/api/Tss2_Sys_HierarchyControl.c index 030079d0f..53b06f7a0 100644 --- a/src/tss2-sys/api/Tss2_Sys_HierarchyControl.c +++ b/src/tss2-sys/api/Tss2_Sys_HierarchyControl.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_HierarchyControl_Prepare( TPMI_RH_ENABLES enable, TPMI_YES_NO state) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -58,7 +58,7 @@ TSS2_RC Tss2_Sys_HierarchyControl_Prepare( TSS2_RC Tss2_Sys_HierarchyControl_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -74,7 +74,7 @@ TSS2_RC Tss2_Sys_HierarchyControl( TPMI_YES_NO state, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_HierarchyControl_Prepare(sysContext, authHandle, enable, state); diff --git a/src/tss2-sys/api/Tss2_Sys_Import.c b/src/tss2-sys/api/Tss2_Sys_Import.c index bfb4c146e..06cc48a6b 100644 --- a/src/tss2-sys/api/Tss2_Sys_Import.c +++ b/src/tss2-sys/api/Tss2_Sys_Import.c @@ -23,7 +23,7 @@ TSS2_RC Tss2_Sys_Import_Prepare( const TPM2B_ENCRYPTED_SECRET *inSymSeed, const TPMT_SYM_DEF_OBJECT *symmetricAlg) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !symmetricAlg) @@ -122,7 +122,7 @@ TSS2_RC Tss2_Sys_Import_Complete( TSS2_SYS_CONTEXT *sysContext, TPM2B_PRIVATE *outPrivate) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -150,7 +150,7 @@ TSS2_RC Tss2_Sys_Import( TPM2B_PRIVATE *outPrivate, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!symmetricAlg) diff --git a/src/tss2-sys/api/Tss2_Sys_IncrementalSelfTest.c b/src/tss2-sys/api/Tss2_Sys_IncrementalSelfTest.c index 8861042be..9b67aa82b 100644 --- a/src/tss2-sys/api/Tss2_Sys_IncrementalSelfTest.c +++ b/src/tss2-sys/api/Tss2_Sys_IncrementalSelfTest.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_IncrementalSelfTest_Prepare( TSS2_SYS_CONTEXT *sysContext, const TPML_ALG *toTest) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !toTest) @@ -45,7 +45,7 @@ TSS2_RC Tss2_Sys_IncrementalSelfTest_Complete( TSS2_SYS_CONTEXT *sysContext, TPML_ALG *toDoList) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -67,7 +67,7 @@ TSS2_RC Tss2_Sys_IncrementalSelfTest( TPML_ALG *toDoList, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!toTest) diff --git a/src/tss2-sys/api/Tss2_Sys_Initialize.c b/src/tss2-sys/api/Tss2_Sys_Initialize.c index 9634be35d..5c0db2e60 100644 --- a/src/tss2-sys/api/Tss2_Sys_Initialize.c +++ b/src/tss2-sys/api/Tss2_Sys_Initialize.c @@ -34,12 +34,12 @@ TSS2_RC Tss2_Sys_Initialize( TSS2_TCTI_CONTEXT *tctiContext, TSS2_ABI_VERSION *abiVersion) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx || !tctiContext) return TSS2_SYS_RC_BAD_REFERENCE; - if (contextSize < sizeof(_TSS2_SYS_CONTEXT_BLOB)) + if (contextSize < sizeof(TSS2_SYS_CONTEXT_BLOB)) return TSS2_SYS_RC_INSUFFICIENT_CONTEXT; if (!TSS2_TCTI_TRANSMIT (tctiContext) || diff --git a/src/tss2-sys/api/Tss2_Sys_Load.c b/src/tss2-sys/api/Tss2_Sys_Load.c index 15c23592b..52d13c84b 100644 --- a/src/tss2-sys/api/Tss2_Sys_Load.c +++ b/src/tss2-sys/api/Tss2_Sys_Load.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_Load_Prepare( const TPM2B_PRIVATE *inPrivate, const TPM2B_PUBLIC *inPublic) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -83,7 +83,7 @@ TSS2_RC Tss2_Sys_Load_Complete( TPM2_HANDLE *objectHandle, TPM2B_NAME *name) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -114,7 +114,7 @@ TSS2_RC Tss2_Sys_Load( TPM2B_NAME *name, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_Load_Prepare(sysContext, parentHandle, inPrivate, inPublic); diff --git a/src/tss2-sys/api/Tss2_Sys_LoadExternal.c b/src/tss2-sys/api/Tss2_Sys_LoadExternal.c index 074b9fe9b..2394cbfdb 100644 --- a/src/tss2-sys/api/Tss2_Sys_LoadExternal.c +++ b/src/tss2-sys/api/Tss2_Sys_LoadExternal.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_LoadExternal_Prepare( const TPM2B_PUBLIC *inPublic, TPMI_RH_HIERARCHY hierarchy) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -85,7 +85,7 @@ TSS2_RC Tss2_Sys_LoadExternal_Complete( TPM2_HANDLE *objectHandle, TPM2B_NAME *name) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -117,7 +117,7 @@ TSS2_RC Tss2_Sys_LoadExternal( TPM2B_NAME *name, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_LoadExternal_Prepare(sysContext, inPrivate, inPublic, hierarchy); diff --git a/src/tss2-sys/api/Tss2_Sys_MAC.c b/src/tss2-sys/api/Tss2_Sys_MAC.c index 577832804..6fc94ff5d 100644 --- a/src/tss2-sys/api/Tss2_Sys_MAC.c +++ b/src/tss2-sys/api/Tss2_Sys_MAC.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_MAC_Prepare( const TPM2B_MAX_BUFFER *buffer, TPMI_ALG_MAC_SCHEME inScheme) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -72,7 +72,7 @@ TSS2_RC Tss2_Sys_MAC_Complete( TSS2_SYS_CONTEXT *sysContext, TPM2B_DIGEST *outMAC) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -97,7 +97,7 @@ TSS2_RC Tss2_Sys_MAC( TPM2B_DIGEST *outMAC, TSS2L_SYS_AUTH_RESPONSE *rspAuths) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_MAC_Prepare(sysContext, handle, buffer, inScheme); diff --git a/src/tss2-sys/api/Tss2_Sys_MAC_Start.c b/src/tss2-sys/api/Tss2_Sys_MAC_Start.c index fc2c50d7c..a8c14222a 100644 --- a/src/tss2-sys/api/Tss2_Sys_MAC_Start.c +++ b/src/tss2-sys/api/Tss2_Sys_MAC_Start.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_MAC_Start_Prepare( const TPM2B_AUTH *auth, TPMI_ALG_MAC_SCHEME inScheme) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -72,7 +72,7 @@ TSS2_RC Tss2_Sys_MAC_Start_Complete( TSS2_SYS_CONTEXT *sysContext, TPMI_DH_OBJECT *sequenceHandle) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -97,7 +97,7 @@ TSS2_RC Tss2_Sys_MAC_Start( TPMI_DH_OBJECT *sequenceHandle, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_MAC_Start_Prepare(sysContext, handle, auth, inScheme); diff --git a/src/tss2-sys/api/Tss2_Sys_MakeCredential.c b/src/tss2-sys/api/Tss2_Sys_MakeCredential.c index aa083a9ad..c2e3f9d9c 100644 --- a/src/tss2-sys/api/Tss2_Sys_MakeCredential.c +++ b/src/tss2-sys/api/Tss2_Sys_MakeCredential.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_MakeCredential_Prepare( const TPM2B_DIGEST *credential, const TPM2B_NAME *objectName) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -79,7 +79,7 @@ TSS2_RC Tss2_Sys_MakeCredential_Complete( TPM2B_ID_OBJECT *credentialBlob, TPM2B_ENCRYPTED_SECRET *secret) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -112,7 +112,7 @@ TSS2_RC Tss2_Sys_MakeCredential( TPM2B_ENCRYPTED_SECRET *secret, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_MakeCredential_Prepare(sysContext, handle, credential, objectName); diff --git a/src/tss2-sys/api/Tss2_Sys_NV_Certify.c b/src/tss2-sys/api/Tss2_Sys_NV_Certify.c index 4dc1e43e1..ad3385f4a 100644 --- a/src/tss2-sys/api/Tss2_Sys_NV_Certify.c +++ b/src/tss2-sys/api/Tss2_Sys_NV_Certify.c @@ -24,7 +24,7 @@ TSS2_RC Tss2_Sys_NV_Certify_Prepare( UINT16 size, UINT16 offset) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !inScheme) @@ -98,7 +98,7 @@ TSS2_RC Tss2_Sys_NV_Certify_Complete( TPM2B_ATTEST *certifyInfo, TPMT_SIGNATURE *signature) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -135,7 +135,7 @@ TSS2_RC Tss2_Sys_NV_Certify( TPMT_SIGNATURE *signature, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!inScheme) diff --git a/src/tss2-sys/api/Tss2_Sys_NV_ChangeAuth.c b/src/tss2-sys/api/Tss2_Sys_NV_ChangeAuth.c index badc6d3aa..7c814dcd3 100644 --- a/src/tss2-sys/api/Tss2_Sys_NV_ChangeAuth.c +++ b/src/tss2-sys/api/Tss2_Sys_NV_ChangeAuth.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_NV_ChangeAuth_Prepare( TPMI_RH_NV_INDEX nvIndex, const TPM2B_AUTH *newAuth) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -60,7 +60,7 @@ TSS2_RC Tss2_Sys_NV_ChangeAuth_Prepare( TSS2_RC Tss2_Sys_NV_ChangeAuth_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -75,7 +75,7 @@ TSS2_RC Tss2_Sys_NV_ChangeAuth( const TPM2B_AUTH *newAuth, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_NV_ChangeAuth_Prepare(sysContext, nvIndex, newAuth); diff --git a/src/tss2-sys/api/Tss2_Sys_NV_DefineSpace.c b/src/tss2-sys/api/Tss2_Sys_NV_DefineSpace.c index 445074e99..0189d78c4 100644 --- a/src/tss2-sys/api/Tss2_Sys_NV_DefineSpace.c +++ b/src/tss2-sys/api/Tss2_Sys_NV_DefineSpace.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_NV_DefineSpace_Prepare( const TPM2B_AUTH *auth, const TPM2B_NV_PUBLIC *publicInfo) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -81,7 +81,7 @@ TSS2_RC Tss2_Sys_NV_DefineSpace_Prepare( TSS2_RC Tss2_Sys_NV_DefineSpace_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -97,7 +97,7 @@ TSS2_RC Tss2_Sys_NV_DefineSpace( const TPM2B_NV_PUBLIC *publicInfo, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_NV_DefineSpace_Prepare(sysContext, authHandle, auth, publicInfo); diff --git a/src/tss2-sys/api/Tss2_Sys_NV_Extend.c b/src/tss2-sys/api/Tss2_Sys_NV_Extend.c index 16d6bdc91..3a0212912 100644 --- a/src/tss2-sys/api/Tss2_Sys_NV_Extend.c +++ b/src/tss2-sys/api/Tss2_Sys_NV_Extend.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_NV_Extend_Prepare( TPMI_RH_NV_INDEX nvIndex, const TPM2B_MAX_NV_BUFFER *data) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -67,7 +67,7 @@ TSS2_RC Tss2_Sys_NV_Extend_Prepare( TSS2_RC Tss2_Sys_NV_Extend_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -83,7 +83,7 @@ TSS2_RC Tss2_Sys_NV_Extend( const TPM2B_MAX_NV_BUFFER *data, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_NV_Extend_Prepare(sysContext, authHandle, nvIndex, data); diff --git a/src/tss2-sys/api/Tss2_Sys_NV_GlobalWriteLock.c b/src/tss2-sys/api/Tss2_Sys_NV_GlobalWriteLock.c index d8cc42bec..247c7d502 100644 --- a/src/tss2-sys/api/Tss2_Sys_NV_GlobalWriteLock.c +++ b/src/tss2-sys/api/Tss2_Sys_NV_GlobalWriteLock.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_NV_GlobalWriteLock_Prepare( TSS2_SYS_CONTEXT *sysContext, TPMI_RH_PROVISION authHandle) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -44,7 +44,7 @@ TSS2_RC Tss2_Sys_NV_GlobalWriteLock_Prepare( TSS2_RC Tss2_Sys_NV_GlobalWriteLock_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -58,7 +58,7 @@ TSS2_RC Tss2_Sys_NV_GlobalWriteLock( TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_NV_GlobalWriteLock_Prepare(sysContext, authHandle); diff --git a/src/tss2-sys/api/Tss2_Sys_NV_Increment.c b/src/tss2-sys/api/Tss2_Sys_NV_Increment.c index e0aa84579..b4ed7b89a 100644 --- a/src/tss2-sys/api/Tss2_Sys_NV_Increment.c +++ b/src/tss2-sys/api/Tss2_Sys_NV_Increment.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_NV_Increment_Prepare( TPMI_RH_NV_AUTH authHandle, TPMI_RH_NV_INDEX nvIndex) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -51,7 +51,7 @@ TSS2_RC Tss2_Sys_NV_Increment_Prepare( TSS2_RC Tss2_Sys_NV_Increment_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -66,7 +66,7 @@ TSS2_RC Tss2_Sys_NV_Increment( TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_NV_Increment_Prepare(sysContext, authHandle, nvIndex); diff --git a/src/tss2-sys/api/Tss2_Sys_NV_Read.c b/src/tss2-sys/api/Tss2_Sys_NV_Read.c index 661914a44..80d7941fe 100644 --- a/src/tss2-sys/api/Tss2_Sys_NV_Read.c +++ b/src/tss2-sys/api/Tss2_Sys_NV_Read.c @@ -21,7 +21,7 @@ TSS2_RC Tss2_Sys_NV_Read_Prepare( UINT16 size, UINT16 offset) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -66,7 +66,7 @@ TSS2_RC Tss2_Sys_NV_Read_Complete( TSS2_SYS_CONTEXT *sysContext, TPM2B_MAX_NV_BUFFER *data) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -92,7 +92,7 @@ TSS2_RC Tss2_Sys_NV_Read( TPM2B_MAX_NV_BUFFER *data, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_NV_Read_Prepare(sysContext, authHandle, nvIndex, size, offset); diff --git a/src/tss2-sys/api/Tss2_Sys_NV_ReadLock.c b/src/tss2-sys/api/Tss2_Sys_NV_ReadLock.c index c6b65fd7f..2cf515922 100644 --- a/src/tss2-sys/api/Tss2_Sys_NV_ReadLock.c +++ b/src/tss2-sys/api/Tss2_Sys_NV_ReadLock.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_NV_ReadLock_Prepare( TPMI_RH_NV_AUTH authHandle, TPMI_RH_NV_INDEX nvIndex) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -51,7 +51,7 @@ TSS2_RC Tss2_Sys_NV_ReadLock_Prepare( TSS2_RC Tss2_Sys_NV_ReadLock_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -66,7 +66,7 @@ TSS2_RC Tss2_Sys_NV_ReadLock( TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_NV_ReadLock_Prepare(sysContext, authHandle, nvIndex); diff --git a/src/tss2-sys/api/Tss2_Sys_NV_ReadPublic.c b/src/tss2-sys/api/Tss2_Sys_NV_ReadPublic.c index 6ab71ba87..708301913 100644 --- a/src/tss2-sys/api/Tss2_Sys_NV_ReadPublic.c +++ b/src/tss2-sys/api/Tss2_Sys_NV_ReadPublic.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_NV_ReadPublic_Prepare( TSS2_SYS_CONTEXT *sysContext, TPMI_RH_NV_INDEX nvIndex) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -46,7 +46,7 @@ TSS2_RC Tss2_Sys_NV_ReadPublic_Complete( TPM2B_NV_PUBLIC *nvPublic, TPM2B_NAME *nvName) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -77,7 +77,7 @@ TSS2_RC Tss2_Sys_NV_ReadPublic( TPM2B_NAME *nvName, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_NV_ReadPublic_Prepare(sysContext, nvIndex); diff --git a/src/tss2-sys/api/Tss2_Sys_NV_SetBits.c b/src/tss2-sys/api/Tss2_Sys_NV_SetBits.c index 7e11c063f..9dcbdf578 100644 --- a/src/tss2-sys/api/Tss2_Sys_NV_SetBits.c +++ b/src/tss2-sys/api/Tss2_Sys_NV_SetBits.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_NV_SetBits_Prepare( TPMI_RH_NV_INDEX nvIndex, UINT64 bits) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -58,7 +58,7 @@ TSS2_RC Tss2_Sys_NV_SetBits_Prepare( TSS2_RC Tss2_Sys_NV_SetBits_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -74,7 +74,7 @@ TSS2_RC Tss2_Sys_NV_SetBits( UINT64 bits, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_NV_SetBits_Prepare(sysContext, authHandle, nvIndex, bits); diff --git a/src/tss2-sys/api/Tss2_Sys_NV_UndefineSpace.c b/src/tss2-sys/api/Tss2_Sys_NV_UndefineSpace.c index 8b385aedb..d0be7a8f1 100644 --- a/src/tss2-sys/api/Tss2_Sys_NV_UndefineSpace.c +++ b/src/tss2-sys/api/Tss2_Sys_NV_UndefineSpace.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_NV_UndefineSpace_Prepare( TPMI_RH_PROVISION authHandle, TPMI_RH_NV_INDEX nvIndex) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -51,7 +51,7 @@ TSS2_RC Tss2_Sys_NV_UndefineSpace_Prepare( TSS2_RC Tss2_Sys_NV_UndefineSpace_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -66,7 +66,7 @@ TSS2_RC Tss2_Sys_NV_UndefineSpace( TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_NV_UndefineSpace_Prepare(sysContext, authHandle, nvIndex); diff --git a/src/tss2-sys/api/Tss2_Sys_NV_UndefineSpaceSpecial.c b/src/tss2-sys/api/Tss2_Sys_NV_UndefineSpaceSpecial.c index 6a3edba62..d8c6d2cb3 100644 --- a/src/tss2-sys/api/Tss2_Sys_NV_UndefineSpaceSpecial.c +++ b/src/tss2-sys/api/Tss2_Sys_NV_UndefineSpaceSpecial.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_NV_UndefineSpaceSpecial_Prepare( TPMI_RH_NV_INDEX nvIndex, TPMI_RH_PLATFORM platform) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -51,7 +51,7 @@ TSS2_RC Tss2_Sys_NV_UndefineSpaceSpecial_Prepare( TSS2_RC Tss2_Sys_NV_UndefineSpaceSpecial_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -66,7 +66,7 @@ TSS2_RC Tss2_Sys_NV_UndefineSpaceSpecial( TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_NV_UndefineSpaceSpecial_Prepare(sysContext, nvIndex, platform); diff --git a/src/tss2-sys/api/Tss2_Sys_NV_Write.c b/src/tss2-sys/api/Tss2_Sys_NV_Write.c index 9b602ec26..bd47a88d3 100644 --- a/src/tss2-sys/api/Tss2_Sys_NV_Write.c +++ b/src/tss2-sys/api/Tss2_Sys_NV_Write.c @@ -21,7 +21,7 @@ TSS2_RC Tss2_Sys_NV_Write_Prepare( const TPM2B_MAX_NV_BUFFER *data, UINT16 offset) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -74,7 +74,7 @@ TSS2_RC Tss2_Sys_NV_Write_Prepare( TSS2_RC Tss2_Sys_NV_Write_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -91,7 +91,7 @@ TSS2_RC Tss2_Sys_NV_Write( UINT16 offset, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_NV_Write_Prepare(sysContext, authHandle, nvIndex, data, offset); diff --git a/src/tss2-sys/api/Tss2_Sys_NV_WriteLock.c b/src/tss2-sys/api/Tss2_Sys_NV_WriteLock.c index 020393a23..c32f45cfe 100644 --- a/src/tss2-sys/api/Tss2_Sys_NV_WriteLock.c +++ b/src/tss2-sys/api/Tss2_Sys_NV_WriteLock.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_NV_WriteLock_Prepare( TPMI_RH_NV_AUTH authHandle, TPMI_RH_NV_INDEX nvIndex) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -51,7 +51,7 @@ TSS2_RC Tss2_Sys_NV_WriteLock_Prepare( TSS2_RC Tss2_Sys_NV_WriteLock_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -66,7 +66,7 @@ TSS2_RC Tss2_Sys_NV_WriteLock( TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_NV_WriteLock_Prepare(sysContext, authHandle, nvIndex); diff --git a/src/tss2-sys/api/Tss2_Sys_ObjectChangeAuth.c b/src/tss2-sys/api/Tss2_Sys_ObjectChangeAuth.c index 231066a76..9aa11b713 100644 --- a/src/tss2-sys/api/Tss2_Sys_ObjectChangeAuth.c +++ b/src/tss2-sys/api/Tss2_Sys_ObjectChangeAuth.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_ObjectChangeAuth_Prepare( TPMI_DH_OBJECT parentHandle, const TPM2B_AUTH *newAuth) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -68,7 +68,7 @@ TSS2_RC Tss2_Sys_ObjectChangeAuth_Complete( TSS2_SYS_CONTEXT *sysContext, TPM2B_PRIVATE *outPrivate) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -93,7 +93,7 @@ TSS2_RC Tss2_Sys_ObjectChangeAuth( TPM2B_PRIVATE *outPrivate, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_ObjectChangeAuth_Prepare(sysContext, objectHandle, parentHandle, newAuth); diff --git a/src/tss2-sys/api/Tss2_Sys_PCR_Allocate.c b/src/tss2-sys/api/Tss2_Sys_PCR_Allocate.c index 4a4ac1b85..e6fb2d705 100644 --- a/src/tss2-sys/api/Tss2_Sys_PCR_Allocate.c +++ b/src/tss2-sys/api/Tss2_Sys_PCR_Allocate.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_PCR_Allocate_Prepare( TPMI_RH_PLATFORM authHandle, const TPML_PCR_SELECTION *pcrAllocation) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !pcrAllocation) @@ -60,7 +60,7 @@ TSS2_RC Tss2_Sys_PCR_Allocate_Complete( UINT32 *sizeNeeded, UINT32 *sizeAvailable) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -108,7 +108,7 @@ TSS2_RC Tss2_Sys_PCR_Allocate( UINT32 *sizeAvailable, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!pcrAllocation) diff --git a/src/tss2-sys/api/Tss2_Sys_PCR_Event.c b/src/tss2-sys/api/Tss2_Sys_PCR_Event.c index a7e0e970c..3cf6842ae 100644 --- a/src/tss2-sys/api/Tss2_Sys_PCR_Event.c +++ b/src/tss2-sys/api/Tss2_Sys_PCR_Event.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_PCR_Event_Prepare( TPMI_DH_PCR pcrHandle, const TPM2B_EVENT *eventData) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -61,7 +61,7 @@ TSS2_RC Tss2_Sys_PCR_Event_Complete( TSS2_SYS_CONTEXT *sysContext, TPML_DIGEST_VALUES *digests) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -85,7 +85,7 @@ TSS2_RC Tss2_Sys_PCR_Event( TPML_DIGEST_VALUES *digests, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_PCR_Event_Prepare(sysContext, pcrHandle, eventData); diff --git a/src/tss2-sys/api/Tss2_Sys_PCR_Extend.c b/src/tss2-sys/api/Tss2_Sys_PCR_Extend.c index 61acc4bf0..ec4b61e67 100644 --- a/src/tss2-sys/api/Tss2_Sys_PCR_Extend.c +++ b/src/tss2-sys/api/Tss2_Sys_PCR_Extend.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_PCR_Extend_Prepare( TPMI_DH_PCR pcrHandle, const TPML_DIGEST_VALUES *digests) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !digests) @@ -51,7 +51,7 @@ TSS2_RC Tss2_Sys_PCR_Extend_Prepare( TSS2_RC Tss2_Sys_PCR_Extend_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -66,7 +66,7 @@ TSS2_RC Tss2_Sys_PCR_Extend( const TPML_DIGEST_VALUES *digests, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!digests) diff --git a/src/tss2-sys/api/Tss2_Sys_PCR_Read.c b/src/tss2-sys/api/Tss2_Sys_PCR_Read.c index 52597525e..1a66162a2 100644 --- a/src/tss2-sys/api/Tss2_Sys_PCR_Read.c +++ b/src/tss2-sys/api/Tss2_Sys_PCR_Read.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_PCR_Read_Prepare( TSS2_SYS_CONTEXT *sysContext, const TPML_PCR_SELECTION *pcrSelectionIn) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !pcrSelectionIn) @@ -48,7 +48,7 @@ TSS2_RC Tss2_Sys_PCR_Read_Complete( TPML_PCR_SELECTION *pcrSelectionOut, TPML_DIGEST *pcrValues) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -86,7 +86,7 @@ TSS2_RC Tss2_Sys_PCR_Read( TPML_DIGEST *pcrValues, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!pcrSelectionIn) diff --git a/src/tss2-sys/api/Tss2_Sys_PCR_Reset.c b/src/tss2-sys/api/Tss2_Sys_PCR_Reset.c index ee77e3970..15d4cfb6c 100644 --- a/src/tss2-sys/api/Tss2_Sys_PCR_Reset.c +++ b/src/tss2-sys/api/Tss2_Sys_PCR_Reset.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_PCR_Reset_Prepare( TSS2_SYS_CONTEXT *sysContext, TPMI_DH_PCR pcrHandle) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -44,7 +44,7 @@ TSS2_RC Tss2_Sys_PCR_Reset_Prepare( TSS2_RC Tss2_Sys_PCR_Reset_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -58,7 +58,7 @@ TSS2_RC Tss2_Sys_PCR_Reset( TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_PCR_Reset_Prepare(sysContext, pcrHandle); diff --git a/src/tss2-sys/api/Tss2_Sys_PCR_SetAuthPolicy.c b/src/tss2-sys/api/Tss2_Sys_PCR_SetAuthPolicy.c index 1072edb18..40b0f6a10 100644 --- a/src/tss2-sys/api/Tss2_Sys_PCR_SetAuthPolicy.c +++ b/src/tss2-sys/api/Tss2_Sys_PCR_SetAuthPolicy.c @@ -21,7 +21,7 @@ TSS2_RC Tss2_Sys_PCR_SetAuthPolicy_Prepare( TPMI_ALG_HASH hashAlg, TPMI_DH_PCR pcrNum) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -78,7 +78,7 @@ TSS2_RC Tss2_Sys_PCR_SetAuthPolicy_Prepare( TSS2_RC Tss2_Sys_PCR_SetAuthPolicy_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -95,7 +95,7 @@ TSS2_RC Tss2_Sys_PCR_SetAuthPolicy( TPMI_DH_PCR pcrNum, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_PCR_SetAuthPolicy_Prepare(sysContext, authHandle, authPolicy, hashAlg, pcrNum); diff --git a/src/tss2-sys/api/Tss2_Sys_PCR_SetAuthValue.c b/src/tss2-sys/api/Tss2_Sys_PCR_SetAuthValue.c index 5168f2392..0995680a3 100644 --- a/src/tss2-sys/api/Tss2_Sys_PCR_SetAuthValue.c +++ b/src/tss2-sys/api/Tss2_Sys_PCR_SetAuthValue.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_PCR_SetAuthValue_Prepare( TPMI_DH_PCR pcrHandle, const TPM2B_DIGEST *auth) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -60,7 +60,7 @@ TSS2_RC Tss2_Sys_PCR_SetAuthValue_Prepare( TSS2_RC Tss2_Sys_PCR_SetAuthValue_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -75,7 +75,7 @@ TSS2_RC Tss2_Sys_PCR_SetAuthValue( const TPM2B_DIGEST *auth, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_PCR_SetAuthValue_Prepare(sysContext, pcrHandle, auth); diff --git a/src/tss2-sys/api/Tss2_Sys_PP_Commands.c b/src/tss2-sys/api/Tss2_Sys_PP_Commands.c index 5cdde2667..790fd3748 100644 --- a/src/tss2-sys/api/Tss2_Sys_PP_Commands.c +++ b/src/tss2-sys/api/Tss2_Sys_PP_Commands.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_PP_Commands_Prepare( const TPML_CC *setList, const TPML_CC *clearList) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !setList || !clearList) @@ -58,7 +58,7 @@ TSS2_RC Tss2_Sys_PP_Commands_Prepare( TSS2_RC Tss2_Sys_PP_Commands_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -74,7 +74,7 @@ TSS2_RC Tss2_Sys_PP_Commands( const TPML_CC *clearList, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!setList || !clearList) diff --git a/src/tss2-sys/api/Tss2_Sys_PolicyAuthValue.c b/src/tss2-sys/api/Tss2_Sys_PolicyAuthValue.c index 39136e5fd..ef39e63e0 100644 --- a/src/tss2-sys/api/Tss2_Sys_PolicyAuthValue.c +++ b/src/tss2-sys/api/Tss2_Sys_PolicyAuthValue.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_PolicyAuthValue_Prepare( TSS2_SYS_CONTEXT *sysContext, TPMI_SH_POLICY policySession) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -44,7 +44,7 @@ TSS2_RC Tss2_Sys_PolicyAuthValue_Prepare( TSS2_RC Tss2_Sys_PolicyAuthValue_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -58,7 +58,7 @@ TSS2_RC Tss2_Sys_PolicyAuthValue( TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_PolicyAuthValue_Prepare(sysContext, policySession); diff --git a/src/tss2-sys/api/Tss2_Sys_PolicyAuthorize.c b/src/tss2-sys/api/Tss2_Sys_PolicyAuthorize.c index accd871b6..273d0912c 100644 --- a/src/tss2-sys/api/Tss2_Sys_PolicyAuthorize.c +++ b/src/tss2-sys/api/Tss2_Sys_PolicyAuthorize.c @@ -22,7 +22,7 @@ TSS2_RC Tss2_Sys_PolicyAuthorize_Prepare( const TPM2B_NAME *keySign, const TPMT_TK_VERIFIED *checkTicket) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !checkTicket) @@ -100,7 +100,7 @@ TSS2_RC Tss2_Sys_PolicyAuthorize_Prepare( TSS2_RC Tss2_Sys_PolicyAuthorize_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -118,7 +118,7 @@ TSS2_RC Tss2_Sys_PolicyAuthorize( const TPMT_TK_VERIFIED *checkTicket, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!checkTicket) diff --git a/src/tss2-sys/api/Tss2_Sys_PolicyAuthorizeNV.c b/src/tss2-sys/api/Tss2_Sys_PolicyAuthorizeNV.c index 2b3822f8b..586a392dd 100644 --- a/src/tss2-sys/api/Tss2_Sys_PolicyAuthorizeNV.c +++ b/src/tss2-sys/api/Tss2_Sys_PolicyAuthorizeNV.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_PolicyAuthorizeNV_Prepare( TPMI_RH_NV_INDEX nvIndex, TPMI_SH_POLICY policySession) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -58,7 +58,7 @@ TSS2_RC Tss2_Sys_PolicyAuthorizeNV_Prepare( TSS2_RC Tss2_Sys_PolicyAuthorizeNV_Complete( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -74,7 +74,7 @@ TSS2_RC Tss2_Sys_PolicyAuthorizeNV( TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_PolicyAuthorizeNV_Prepare(sysContext, authHandle, diff --git a/src/tss2-sys/api/Tss2_Sys_PolicyCommandCode.c b/src/tss2-sys/api/Tss2_Sys_PolicyCommandCode.c index daf60d181..dda362b6a 100644 --- a/src/tss2-sys/api/Tss2_Sys_PolicyCommandCode.c +++ b/src/tss2-sys/api/Tss2_Sys_PolicyCommandCode.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_PolicyCommandCode_Prepare( TPMI_SH_POLICY policySession, TPM2_CC code) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -51,7 +51,7 @@ TSS2_RC Tss2_Sys_PolicyCommandCode_Prepare( TSS2_RC Tss2_Sys_PolicyCommandCode_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -66,7 +66,7 @@ TSS2_RC Tss2_Sys_PolicyCommandCode( TPM2_CC code, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_PolicyCommandCode_Prepare(sysContext, policySession, code); diff --git a/src/tss2-sys/api/Tss2_Sys_PolicyCounterTimer.c b/src/tss2-sys/api/Tss2_Sys_PolicyCounterTimer.c index 004b29a5a..ad2e942da 100644 --- a/src/tss2-sys/api/Tss2_Sys_PolicyCounterTimer.c +++ b/src/tss2-sys/api/Tss2_Sys_PolicyCounterTimer.c @@ -21,7 +21,7 @@ TSS2_RC Tss2_Sys_PolicyCounterTimer_Prepare( UINT16 offset, TPM2_EO operation) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -75,7 +75,7 @@ TSS2_RC Tss2_Sys_PolicyCounterTimer_Prepare( TSS2_RC Tss2_Sys_PolicyCounterTimer_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -92,7 +92,7 @@ TSS2_RC Tss2_Sys_PolicyCounterTimer( TPM2_EO operation, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_PolicyCounterTimer_Prepare(sysContext, policySession, diff --git a/src/tss2-sys/api/Tss2_Sys_PolicyCpHash.c b/src/tss2-sys/api/Tss2_Sys_PolicyCpHash.c index 201b6cc42..578b63718 100644 --- a/src/tss2-sys/api/Tss2_Sys_PolicyCpHash.c +++ b/src/tss2-sys/api/Tss2_Sys_PolicyCpHash.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_PolicyCpHash_Prepare( TPMI_SH_POLICY policySession, const TPM2B_DIGEST *cpHashA) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -60,7 +60,7 @@ TSS2_RC Tss2_Sys_PolicyCpHash_Prepare( TSS2_RC Tss2_Sys_PolicyCpHash_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -75,7 +75,7 @@ TSS2_RC Tss2_Sys_PolicyCpHash( const TPM2B_DIGEST *cpHashA, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_PolicyCpHash_Prepare(sysContext, policySession, cpHashA); diff --git a/src/tss2-sys/api/Tss2_Sys_PolicyDuplicationSelect.c b/src/tss2-sys/api/Tss2_Sys_PolicyDuplicationSelect.c index 4faabbc44..3312fd824 100644 --- a/src/tss2-sys/api/Tss2_Sys_PolicyDuplicationSelect.c +++ b/src/tss2-sys/api/Tss2_Sys_PolicyDuplicationSelect.c @@ -21,7 +21,7 @@ TSS2_RC Tss2_Sys_PolicyDuplicationSelect_Prepare( const TPM2B_NAME *newParentName, TPMI_YES_NO includeObject) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -84,7 +84,7 @@ TSS2_RC Tss2_Sys_PolicyDuplicationSelect_Prepare( TSS2_RC Tss2_Sys_PolicyDuplicationSelect_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -101,7 +101,7 @@ TSS2_RC Tss2_Sys_PolicyDuplicationSelect( TPMI_YES_NO includeObject, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_PolicyDuplicationSelect_Prepare(sysContext, policySession, diff --git a/src/tss2-sys/api/Tss2_Sys_PolicyGetDigest.c b/src/tss2-sys/api/Tss2_Sys_PolicyGetDigest.c index 0735f430e..151c40cb7 100644 --- a/src/tss2-sys/api/Tss2_Sys_PolicyGetDigest.c +++ b/src/tss2-sys/api/Tss2_Sys_PolicyGetDigest.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_PolicyGetDigest_Prepare( TSS2_SYS_CONTEXT *sysContext, TPMI_SH_POLICY policySession) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -45,7 +45,7 @@ TSS2_RC Tss2_Sys_PolicyGetDigest_Complete( TSS2_SYS_CONTEXT *sysContext, TPM2B_DIGEST *policyDigest) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -68,7 +68,7 @@ TSS2_RC Tss2_Sys_PolicyGetDigest( TPM2B_DIGEST *policyDigest, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_PolicyGetDigest_Prepare(sysContext, policySession); diff --git a/src/tss2-sys/api/Tss2_Sys_PolicyLocality.c b/src/tss2-sys/api/Tss2_Sys_PolicyLocality.c index 87865a3cb..b61b5352e 100644 --- a/src/tss2-sys/api/Tss2_Sys_PolicyLocality.c +++ b/src/tss2-sys/api/Tss2_Sys_PolicyLocality.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_PolicyLocality_Prepare( TPMI_SH_POLICY policySession, TPMA_LOCALITY locality) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -51,7 +51,7 @@ TSS2_RC Tss2_Sys_PolicyLocality_Prepare( TSS2_RC Tss2_Sys_PolicyLocality_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -66,7 +66,7 @@ TSS2_RC Tss2_Sys_PolicyLocality( TPMA_LOCALITY locality, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_PolicyLocality_Prepare(sysContext, policySession, locality); diff --git a/src/tss2-sys/api/Tss2_Sys_PolicyNV.c b/src/tss2-sys/api/Tss2_Sys_PolicyNV.c index 1426a60dd..ef55047c7 100644 --- a/src/tss2-sys/api/Tss2_Sys_PolicyNV.c +++ b/src/tss2-sys/api/Tss2_Sys_PolicyNV.c @@ -23,7 +23,7 @@ TSS2_RC Tss2_Sys_PolicyNV_Prepare( UINT16 offset, TPM2_EO operation) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -89,7 +89,7 @@ TSS2_RC Tss2_Sys_PolicyNV_Prepare( TSS2_RC Tss2_Sys_PolicyNV_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -108,7 +108,7 @@ TSS2_RC Tss2_Sys_PolicyNV( TPM2_EO operation, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_PolicyNV_Prepare(sysContext, authHandle, nvIndex, diff --git a/src/tss2-sys/api/Tss2_Sys_PolicyNameHash.c b/src/tss2-sys/api/Tss2_Sys_PolicyNameHash.c index ce799e8b8..5bfc35beb 100644 --- a/src/tss2-sys/api/Tss2_Sys_PolicyNameHash.c +++ b/src/tss2-sys/api/Tss2_Sys_PolicyNameHash.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_PolicyNameHash_Prepare( TPMI_SH_POLICY policySession, const TPM2B_DIGEST *nameHash) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -60,7 +60,7 @@ TSS2_RC Tss2_Sys_PolicyNameHash_Prepare( TSS2_RC Tss2_Sys_PolicyNameHash_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -75,7 +75,7 @@ TSS2_RC Tss2_Sys_PolicyNameHash( const TPM2B_DIGEST *nameHash, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_PolicyNameHash_Prepare(sysContext, policySession, nameHash); diff --git a/src/tss2-sys/api/Tss2_Sys_PolicyNvWritten.c b/src/tss2-sys/api/Tss2_Sys_PolicyNvWritten.c index 89a7f8ac4..8c838013f 100644 --- a/src/tss2-sys/api/Tss2_Sys_PolicyNvWritten.c +++ b/src/tss2-sys/api/Tss2_Sys_PolicyNvWritten.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_PolicyNvWritten_Prepare( TPMI_SH_POLICY policySession, TPMI_YES_NO writtenSet) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -51,7 +51,7 @@ TSS2_RC Tss2_Sys_PolicyNvWritten_Prepare( TSS2_RC Tss2_Sys_PolicyNvWritten_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -66,7 +66,7 @@ TSS2_RC Tss2_Sys_PolicyNvWritten( TPMI_YES_NO writtenSet, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_PolicyNvWritten_Prepare(sysContext, policySession, writtenSet); diff --git a/src/tss2-sys/api/Tss2_Sys_PolicyOR.c b/src/tss2-sys/api/Tss2_Sys_PolicyOR.c index fdd9110d4..600f7ee36 100644 --- a/src/tss2-sys/api/Tss2_Sys_PolicyOR.c +++ b/src/tss2-sys/api/Tss2_Sys_PolicyOR.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_PolicyOR_Prepare( TPMI_SH_POLICY policySession, const TPML_DIGEST *pHashList) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !pHashList) @@ -51,7 +51,7 @@ TSS2_RC Tss2_Sys_PolicyOR_Prepare( TSS2_RC Tss2_Sys_PolicyOR_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -66,7 +66,7 @@ TSS2_RC Tss2_Sys_PolicyOR( const TPML_DIGEST *pHashList, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!pHashList) diff --git a/src/tss2-sys/api/Tss2_Sys_PolicyPCR.c b/src/tss2-sys/api/Tss2_Sys_PolicyPCR.c index 7b84d1040..7569b8270 100644 --- a/src/tss2-sys/api/Tss2_Sys_PolicyPCR.c +++ b/src/tss2-sys/api/Tss2_Sys_PolicyPCR.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_PolicyPCR_Prepare( const TPM2B_DIGEST *pcrDigest, const TPML_PCR_SELECTION *pcrs) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !pcrs) @@ -72,7 +72,7 @@ TSS2_RC Tss2_Sys_PolicyPCR_Prepare( TSS2_RC Tss2_Sys_PolicyPCR_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -88,7 +88,7 @@ TSS2_RC Tss2_Sys_PolicyPCR( const TPML_PCR_SELECTION *pcrs, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!pcrs) diff --git a/src/tss2-sys/api/Tss2_Sys_PolicyPassword.c b/src/tss2-sys/api/Tss2_Sys_PolicyPassword.c index 0a73eea46..93e0b00b8 100644 --- a/src/tss2-sys/api/Tss2_Sys_PolicyPassword.c +++ b/src/tss2-sys/api/Tss2_Sys_PolicyPassword.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_PolicyPassword_Prepare( TSS2_SYS_CONTEXT *sysContext, TPMI_SH_POLICY policySession) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -44,7 +44,7 @@ TSS2_RC Tss2_Sys_PolicyPassword_Prepare( TSS2_RC Tss2_Sys_PolicyPassword_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -58,7 +58,7 @@ TSS2_RC Tss2_Sys_PolicyPassword( TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_PolicyPassword_Prepare(sysContext, policySession); diff --git a/src/tss2-sys/api/Tss2_Sys_PolicyPhysicalPresence.c b/src/tss2-sys/api/Tss2_Sys_PolicyPhysicalPresence.c index 46c7a42db..47921ab51 100644 --- a/src/tss2-sys/api/Tss2_Sys_PolicyPhysicalPresence.c +++ b/src/tss2-sys/api/Tss2_Sys_PolicyPhysicalPresence.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_PolicyPhysicalPresence_Prepare( TSS2_SYS_CONTEXT *sysContext, TPMI_SH_POLICY policySession) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -44,7 +44,7 @@ TSS2_RC Tss2_Sys_PolicyPhysicalPresence_Prepare( TSS2_RC Tss2_Sys_PolicyPhysicalPresence_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -58,7 +58,7 @@ TSS2_RC Tss2_Sys_PolicyPhysicalPresence( TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_PolicyPhysicalPresence_Prepare(sysContext, policySession); diff --git a/src/tss2-sys/api/Tss2_Sys_PolicyRestart.c b/src/tss2-sys/api/Tss2_Sys_PolicyRestart.c index f9596c279..4436822ba 100644 --- a/src/tss2-sys/api/Tss2_Sys_PolicyRestart.c +++ b/src/tss2-sys/api/Tss2_Sys_PolicyRestart.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_PolicyRestart_Prepare( TSS2_SYS_CONTEXT *sysContext, TPMI_SH_POLICY sessionHandle) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -44,7 +44,7 @@ TSS2_RC Tss2_Sys_PolicyRestart_Prepare( TSS2_RC Tss2_Sys_PolicyRestart_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -58,7 +58,7 @@ TSS2_RC Tss2_Sys_PolicyRestart( TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_PolicyRestart_Prepare(sysContext, sessionHandle); diff --git a/src/tss2-sys/api/Tss2_Sys_PolicySecret.c b/src/tss2-sys/api/Tss2_Sys_PolicySecret.c index 2c04f608b..ecd091042 100644 --- a/src/tss2-sys/api/Tss2_Sys_PolicySecret.c +++ b/src/tss2-sys/api/Tss2_Sys_PolicySecret.c @@ -23,7 +23,7 @@ TSS2_RC Tss2_Sys_PolicySecret_Prepare( const TPM2B_NONCE *policyRef, INT32 expiration) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -101,7 +101,7 @@ TSS2_RC Tss2_Sys_PolicySecret_Complete( TPM2B_TIMEOUT *timeout, TPMT_TK_AUTH *policyTicket) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -135,7 +135,7 @@ TSS2_RC Tss2_Sys_PolicySecret( TPMT_TK_AUTH *policyTicket, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_PolicySecret_Prepare(sysContext, authHandle, policySession, diff --git a/src/tss2-sys/api/Tss2_Sys_PolicySigned.c b/src/tss2-sys/api/Tss2_Sys_PolicySigned.c index 0d3d50819..4dca63430 100644 --- a/src/tss2-sys/api/Tss2_Sys_PolicySigned.c +++ b/src/tss2-sys/api/Tss2_Sys_PolicySigned.c @@ -24,7 +24,7 @@ TSS2_RC Tss2_Sys_PolicySigned_Prepare( INT32 expiration, const TPMT_SIGNATURE *auth) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !auth) @@ -116,7 +116,7 @@ TSS2_RC Tss2_Sys_PolicySigned_Complete( TPM2B_TIMEOUT *timeout, TPMT_TK_AUTH *policyTicket) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -151,7 +151,7 @@ TSS2_RC Tss2_Sys_PolicySigned( TPMT_TK_AUTH *policyTicket, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!auth) diff --git a/src/tss2-sys/api/Tss2_Sys_PolicyTemplate.c b/src/tss2-sys/api/Tss2_Sys_PolicyTemplate.c index af2764e94..2e0eeaf7c 100644 --- a/src/tss2-sys/api/Tss2_Sys_PolicyTemplate.c +++ b/src/tss2-sys/api/Tss2_Sys_PolicyTemplate.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_PolicyTemplate_Prepare( TPMI_SH_POLICY policySession, const TPM2B_DIGEST *templateHash) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -60,7 +60,7 @@ TSS2_RC Tss2_Sys_PolicyTemplate_Prepare( TSS2_RC Tss2_Sys_PolicyTemplate_Complete( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -75,7 +75,7 @@ TSS2_RC Tss2_Sys_PolicyTemplate( const TPM2B_DIGEST *templateHash, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_PolicyTemplate_Prepare(sysContext, policySession, diff --git a/src/tss2-sys/api/Tss2_Sys_PolicyTicket.c b/src/tss2-sys/api/Tss2_Sys_PolicyTicket.c index f908314cc..761d3f4e9 100644 --- a/src/tss2-sys/api/Tss2_Sys_PolicyTicket.c +++ b/src/tss2-sys/api/Tss2_Sys_PolicyTicket.c @@ -23,7 +23,7 @@ TSS2_RC Tss2_Sys_PolicyTicket_Prepare( const TPM2B_NAME *authName, const TPMT_TK_AUTH *ticket) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !ticket) @@ -116,7 +116,7 @@ TSS2_RC Tss2_Sys_PolicyTicket_Prepare( TSS2_RC Tss2_Sys_PolicyTicket_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -135,7 +135,7 @@ TSS2_RC Tss2_Sys_PolicyTicket( const TPMT_TK_AUTH *ticket, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ticket) diff --git a/src/tss2-sys/api/Tss2_Sys_Policy_AC_SendSelect.c b/src/tss2-sys/api/Tss2_Sys_Policy_AC_SendSelect.c index f883c66c2..0145ef3f1 100644 --- a/src/tss2-sys/api/Tss2_Sys_Policy_AC_SendSelect.c +++ b/src/tss2-sys/api/Tss2_Sys_Policy_AC_SendSelect.c @@ -22,7 +22,7 @@ TSS2_RC Tss2_Sys_Policy_AC_SendSelect_Prepare( TPM2B_NAME *acName, TPMI_YES_NO includeObject) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -98,7 +98,7 @@ TSS2_RC Tss2_Sys_Policy_AC_SendSelect_Prepare( TSS2_RC Tss2_Sys_Policy_AC_SendSelect_Complete( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -116,7 +116,7 @@ TSS2_RC Tss2_Sys_Policy_AC_SendSelect( TPMI_YES_NO includeObject, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_Policy_AC_SendSelect_Prepare(sysContext, policySession, diff --git a/src/tss2-sys/api/Tss2_Sys_Quote.c b/src/tss2-sys/api/Tss2_Sys_Quote.c index d81376eb8..c3e46baea 100644 --- a/src/tss2-sys/api/Tss2_Sys_Quote.c +++ b/src/tss2-sys/api/Tss2_Sys_Quote.c @@ -21,7 +21,7 @@ TSS2_RC Tss2_Sys_Quote_Prepare( const TPMT_SIG_SCHEME *inScheme, const TPML_PCR_SELECTION *PCRselect) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !inScheme || !PCRselect) @@ -81,7 +81,7 @@ TSS2_RC Tss2_Sys_Quote_Complete( TPM2B_ATTEST *quoted, TPMT_SIGNATURE *signature) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -113,7 +113,7 @@ TSS2_RC Tss2_Sys_Quote( TPMT_SIGNATURE *signature, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!inScheme || !PCRselect) diff --git a/src/tss2-sys/api/Tss2_Sys_RSA_Decrypt.c b/src/tss2-sys/api/Tss2_Sys_RSA_Decrypt.c index 982c65676..4b4e441c0 100644 --- a/src/tss2-sys/api/Tss2_Sys_RSA_Decrypt.c +++ b/src/tss2-sys/api/Tss2_Sys_RSA_Decrypt.c @@ -21,7 +21,7 @@ TSS2_RC Tss2_Sys_RSA_Decrypt_Prepare( const TPMT_RSA_DECRYPT *inScheme, const TPM2B_DATA *label) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !inScheme) @@ -86,7 +86,7 @@ TSS2_RC Tss2_Sys_RSA_Decrypt_Complete( TSS2_SYS_CONTEXT *sysContext, TPM2B_PUBLIC_KEY_RSA *message) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -111,7 +111,7 @@ TSS2_RC Tss2_Sys_RSA_Decrypt( TPM2B_PUBLIC_KEY_RSA *message, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!inScheme) diff --git a/src/tss2-sys/api/Tss2_Sys_RSA_Encrypt.c b/src/tss2-sys/api/Tss2_Sys_RSA_Encrypt.c index a72e7e252..2e4d3d0c3 100644 --- a/src/tss2-sys/api/Tss2_Sys_RSA_Encrypt.c +++ b/src/tss2-sys/api/Tss2_Sys_RSA_Encrypt.c @@ -21,7 +21,7 @@ TSS2_RC Tss2_Sys_RSA_Encrypt_Prepare( const TPMT_RSA_DECRYPT *inScheme, const TPM2B_DATA *label) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !inScheme) @@ -85,7 +85,7 @@ TSS2_RC Tss2_Sys_RSA_Encrypt_Complete( TSS2_SYS_CONTEXT *sysContext, TPM2B_PUBLIC_KEY_RSA *outData) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -110,7 +110,7 @@ TSS2_RC Tss2_Sys_RSA_Encrypt( TPM2B_PUBLIC_KEY_RSA *outData, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!inScheme) diff --git a/src/tss2-sys/api/Tss2_Sys_ReadClock.c b/src/tss2-sys/api/Tss2_Sys_ReadClock.c index 4e8e24eda..9f90b0f8e 100644 --- a/src/tss2-sys/api/Tss2_Sys_ReadClock.c +++ b/src/tss2-sys/api/Tss2_Sys_ReadClock.c @@ -17,7 +17,7 @@ TSS2_RC Tss2_Sys_ReadClock_Prepare( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -38,7 +38,7 @@ TSS2_RC Tss2_Sys_ReadClock_Complete( TSS2_SYS_CONTEXT *sysContext, TPMS_TIME_INFO *currentTime) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -60,7 +60,7 @@ TSS2_RC Tss2_Sys_ReadClock( TPMS_TIME_INFO *currentTime, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_ReadClock_Prepare(sysContext); diff --git a/src/tss2-sys/api/Tss2_Sys_ReadPublic.c b/src/tss2-sys/api/Tss2_Sys_ReadPublic.c index 3c8a7d5a7..a19f41698 100644 --- a/src/tss2-sys/api/Tss2_Sys_ReadPublic.c +++ b/src/tss2-sys/api/Tss2_Sys_ReadPublic.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_ReadPublic_Prepare( TSS2_SYS_CONTEXT *sysContext, TPMI_DH_OBJECT objectHandle) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -47,7 +47,7 @@ TSS2_RC Tss2_Sys_ReadPublic_Complete( TPM2B_NAME *name, TPM2B_NAME *qualifiedName) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -83,7 +83,7 @@ TSS2_RC Tss2_Sys_ReadPublic( TPM2B_NAME *qualifiedName, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_ReadPublic_Prepare(sysContext, objectHandle); diff --git a/src/tss2-sys/api/Tss2_Sys_Rewrap.c b/src/tss2-sys/api/Tss2_Sys_Rewrap.c index 7fd6387e4..fa8a45a0c 100644 --- a/src/tss2-sys/api/Tss2_Sys_Rewrap.c +++ b/src/tss2-sys/api/Tss2_Sys_Rewrap.c @@ -22,7 +22,7 @@ TSS2_RC Tss2_Sys_Rewrap_Prepare( const TPM2B_NAME *name, const TPM2B_ENCRYPTED_SECRET *inSymSeed) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -103,7 +103,7 @@ TSS2_RC Tss2_Sys_Rewrap_Complete( TPM2B_PRIVATE *outDuplicate, TPM2B_ENCRYPTED_SECRET *outSymSeed) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -137,7 +137,7 @@ TSS2_RC Tss2_Sys_Rewrap( TPM2B_ENCRYPTED_SECRET *outSymSeed, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_Rewrap_Prepare(sysContext, oldParent, newParent, inDuplicate, name, inSymSeed); diff --git a/src/tss2-sys/api/Tss2_Sys_SelfTest.c b/src/tss2-sys/api/Tss2_Sys_SelfTest.c index 99905b261..da34246b2 100644 --- a/src/tss2-sys/api/Tss2_Sys_SelfTest.c +++ b/src/tss2-sys/api/Tss2_Sys_SelfTest.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_SelfTest_Prepare( TSS2_SYS_CONTEXT *sysContext, TPMI_YES_NO fullTest) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -44,7 +44,7 @@ TSS2_RC Tss2_Sys_SelfTest_Prepare( TSS2_RC Tss2_Sys_SelfTest_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -58,7 +58,7 @@ TSS2_RC Tss2_Sys_SelfTest( TPMI_YES_NO fullTest, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_SelfTest_Prepare(sysContext, fullTest); diff --git a/src/tss2-sys/api/Tss2_Sys_SequenceComplete.c b/src/tss2-sys/api/Tss2_Sys_SequenceComplete.c index 2de4342b4..7e0af49a1 100644 --- a/src/tss2-sys/api/Tss2_Sys_SequenceComplete.c +++ b/src/tss2-sys/api/Tss2_Sys_SequenceComplete.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_SequenceComplete_Prepare( const TPM2B_MAX_BUFFER *buffer, TPMI_RH_HIERARCHY hierarchy) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -70,7 +70,7 @@ TSS2_RC Tss2_Sys_SequenceComplete_Complete( TPM2B_DIGEST *result, TPMT_TK_HASHCHECK *validation) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -101,7 +101,7 @@ TSS2_RC Tss2_Sys_SequenceComplete( TPMT_TK_HASHCHECK *validation, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_SequenceComplete_Prepare(sysContext, sequenceHandle, diff --git a/src/tss2-sys/api/Tss2_Sys_SequenceUpdate.c b/src/tss2-sys/api/Tss2_Sys_SequenceUpdate.c index 3eecb145b..5eb31b042 100644 --- a/src/tss2-sys/api/Tss2_Sys_SequenceUpdate.c +++ b/src/tss2-sys/api/Tss2_Sys_SequenceUpdate.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_SequenceUpdate_Prepare( TPMI_DH_OBJECT sequenceHandle, const TPM2B_MAX_BUFFER *buffer) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -60,7 +60,7 @@ TSS2_RC Tss2_Sys_SequenceUpdate_Prepare( TSS2_RC Tss2_Sys_SequenceUpdate_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -75,7 +75,7 @@ TSS2_RC Tss2_Sys_SequenceUpdate( const TPM2B_MAX_BUFFER *buffer, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_SequenceUpdate_Prepare(sysContext, sequenceHandle, buffer); diff --git a/src/tss2-sys/api/Tss2_Sys_SetAlgorithmSet.c b/src/tss2-sys/api/Tss2_Sys_SetAlgorithmSet.c index 6d4320ec3..8bd0e8e0b 100644 --- a/src/tss2-sys/api/Tss2_Sys_SetAlgorithmSet.c +++ b/src/tss2-sys/api/Tss2_Sys_SetAlgorithmSet.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_SetAlgorithmSet_Prepare( TPMI_RH_PLATFORM authHandle, UINT32 algorithmSet) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -51,7 +51,7 @@ TSS2_RC Tss2_Sys_SetAlgorithmSet_Prepare( TSS2_RC Tss2_Sys_SetAlgorithmSet_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -66,7 +66,7 @@ TSS2_RC Tss2_Sys_SetAlgorithmSet( UINT32 algorithmSet, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_SetAlgorithmSet_Prepare(sysContext, authHandle, algorithmSet); diff --git a/src/tss2-sys/api/Tss2_Sys_SetCmdAuths.c b/src/tss2-sys/api/Tss2_Sys_SetCmdAuths.c index 3bd452e3c..8b0fa7d91 100644 --- a/src/tss2-sys/api/Tss2_Sys_SetCmdAuths.c +++ b/src/tss2-sys/api/Tss2_Sys_SetCmdAuths.c @@ -22,7 +22,7 @@ TSS2_RC Tss2_Sys_SetCmdAuths( TSS2_SYS_CONTEXT *sysContext, const TSS2L_SYS_AUTH_COMMAND *cmdAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); uint16_t i; UINT32 authSize = 0; UINT32 newCmdSize = 0; diff --git a/src/tss2-sys/api/Tss2_Sys_SetCommandCodeAuditStatus.c b/src/tss2-sys/api/Tss2_Sys_SetCommandCodeAuditStatus.c index eb09b0b50..d0c183e1c 100644 --- a/src/tss2-sys/api/Tss2_Sys_SetCommandCodeAuditStatus.c +++ b/src/tss2-sys/api/Tss2_Sys_SetCommandCodeAuditStatus.c @@ -21,7 +21,7 @@ TSS2_RC Tss2_Sys_SetCommandCodeAuditStatus_Prepare( const TPML_CC *setList, const TPML_CC *clearList) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !setList || !clearList) @@ -68,7 +68,7 @@ TSS2_RC Tss2_Sys_SetCommandCodeAuditStatus_Prepare( TSS2_RC Tss2_Sys_SetCommandCodeAuditStatus_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -85,7 +85,7 @@ TSS2_RC Tss2_Sys_SetCommandCodeAuditStatus( const TPML_CC *clearList, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!setList || !clearList) diff --git a/src/tss2-sys/api/Tss2_Sys_SetDecryptParam.c b/src/tss2-sys/api/Tss2_Sys_SetDecryptParam.c index f599eb0ac..a87d98532 100644 --- a/src/tss2-sys/api/Tss2_Sys_SetDecryptParam.c +++ b/src/tss2-sys/api/Tss2_Sys_SetDecryptParam.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_SetDecryptParam( size_t param_size, const uint8_t *param_buffer) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); size_t curr_param_size; const uint8_t *curr_param_buffer; UINT32 command_size; diff --git a/src/tss2-sys/api/Tss2_Sys_SetEncryptParam.c b/src/tss2-sys/api/Tss2_Sys_SetEncryptParam.c index 10b468500..baacf2715 100644 --- a/src/tss2-sys/api/Tss2_Sys_SetEncryptParam.c +++ b/src/tss2-sys/api/Tss2_Sys_SetEncryptParam.c @@ -19,7 +19,7 @@ TSS2_RC Tss2_Sys_SetEncryptParam( size_t encryptParamSize, const uint8_t *encryptParamBuffer) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); size_t currEncryptParamSize; const uint8_t *currEncryptParamBuffer; TSS2_RC rval; diff --git a/src/tss2-sys/api/Tss2_Sys_SetPrimaryPolicy.c b/src/tss2-sys/api/Tss2_Sys_SetPrimaryPolicy.c index 1e8304798..ed18b9500 100644 --- a/src/tss2-sys/api/Tss2_Sys_SetPrimaryPolicy.c +++ b/src/tss2-sys/api/Tss2_Sys_SetPrimaryPolicy.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_SetPrimaryPolicy_Prepare( const TPM2B_DIGEST *authPolicy, TPMI_ALG_HASH hashAlg) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -71,7 +71,7 @@ TSS2_RC Tss2_Sys_SetPrimaryPolicy_Prepare( TSS2_RC Tss2_Sys_SetPrimaryPolicy_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -87,7 +87,7 @@ TSS2_RC Tss2_Sys_SetPrimaryPolicy( TPMI_ALG_HASH hashAlg, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_SetPrimaryPolicy_Prepare(sysContext, authHandle, authPolicy, hashAlg); diff --git a/src/tss2-sys/api/Tss2_Sys_Shutdown.c b/src/tss2-sys/api/Tss2_Sys_Shutdown.c index 22d1aee7a..b8a62eb8b 100644 --- a/src/tss2-sys/api/Tss2_Sys_Shutdown.c +++ b/src/tss2-sys/api/Tss2_Sys_Shutdown.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_Shutdown_Prepare( TSS2_SYS_CONTEXT *sysContext, TPM2_SU shutdownType) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -44,7 +44,7 @@ TSS2_RC Tss2_Sys_Shutdown_Prepare( TSS2_RC Tss2_Sys_Shutdown_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -58,7 +58,7 @@ TSS2_RC Tss2_Sys_Shutdown( TPM2_SU shutdownType, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_Shutdown_Prepare(sysContext, shutdownType); diff --git a/src/tss2-sys/api/Tss2_Sys_Sign.c b/src/tss2-sys/api/Tss2_Sys_Sign.c index 85db8607f..fcdb3e99d 100644 --- a/src/tss2-sys/api/Tss2_Sys_Sign.c +++ b/src/tss2-sys/api/Tss2_Sys_Sign.c @@ -21,7 +21,7 @@ TSS2_RC Tss2_Sys_Sign_Prepare( const TPMT_SIG_SCHEME *inScheme, const TPMT_TK_HASHCHECK *validation) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !inScheme || !validation) @@ -76,7 +76,7 @@ TSS2_RC Tss2_Sys_Sign_Complete( TSS2_SYS_CONTEXT *sysContext, TPMT_SIGNATURE *signature) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -101,7 +101,7 @@ TSS2_RC Tss2_Sys_Sign( TPMT_SIGNATURE *signature, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!inScheme || !validation) diff --git a/src/tss2-sys/api/Tss2_Sys_StartAuthSession.c b/src/tss2-sys/api/Tss2_Sys_StartAuthSession.c index 46cc53178..48512498a 100644 --- a/src/tss2-sys/api/Tss2_Sys_StartAuthSession.c +++ b/src/tss2-sys/api/Tss2_Sys_StartAuthSession.c @@ -24,7 +24,7 @@ TSS2_RC Tss2_Sys_StartAuthSession_Prepare( const TPMT_SYM_DEF *symmetric, TPMI_ALG_HASH authHash) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !symmetric) @@ -111,7 +111,7 @@ TSS2_RC Tss2_Sys_StartAuthSession_Complete( TPMI_SH_AUTH_SESSION *sessionHandle, TPM2B_NONCE *nonceTPM) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -147,7 +147,7 @@ TSS2_RC Tss2_Sys_StartAuthSession( TPM2B_NONCE *nonceTPM, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!symmetric) diff --git a/src/tss2-sys/api/Tss2_Sys_Startup.c b/src/tss2-sys/api/Tss2_Sys_Startup.c index 2ee15f6f0..460bb1053 100644 --- a/src/tss2-sys/api/Tss2_Sys_Startup.c +++ b/src/tss2-sys/api/Tss2_Sys_Startup.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_Startup_Prepare( TSS2_SYS_CONTEXT *sysContext, TPM2_SU startupType) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -44,7 +44,7 @@ TSS2_RC Tss2_Sys_Startup_Prepare( TSS2_RC Tss2_Sys_Startup_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -56,7 +56,7 @@ TSS2_RC Tss2_Sys_Startup( TSS2_SYS_CONTEXT *sysContext, TPM2_SU startupType) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_Startup_Prepare(sysContext, startupType); diff --git a/src/tss2-sys/api/Tss2_Sys_StirRandom.c b/src/tss2-sys/api/Tss2_Sys_StirRandom.c index 0f35333b9..118b8f447 100644 --- a/src/tss2-sys/api/Tss2_Sys_StirRandom.c +++ b/src/tss2-sys/api/Tss2_Sys_StirRandom.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_StirRandom_Prepare( TSS2_SYS_CONTEXT *sysContext, const TPM2B_SENSITIVE_DATA *inData) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -53,7 +53,7 @@ TSS2_RC Tss2_Sys_StirRandom_Prepare( TSS2_RC Tss2_Sys_StirRandom_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -67,7 +67,7 @@ TSS2_RC Tss2_Sys_StirRandom( const TPM2B_SENSITIVE_DATA *inData, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_StirRandom_Prepare(sysContext, inData); diff --git a/src/tss2-sys/api/Tss2_Sys_TestParms.c b/src/tss2-sys/api/Tss2_Sys_TestParms.c index 2b9f13e48..a46c4188a 100644 --- a/src/tss2-sys/api/Tss2_Sys_TestParms.c +++ b/src/tss2-sys/api/Tss2_Sys_TestParms.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_TestParms_Prepare( TSS2_SYS_CONTEXT *sysContext, const TPMT_PUBLIC_PARMS *parameters) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !parameters) @@ -44,7 +44,7 @@ TSS2_RC Tss2_Sys_TestParms_Prepare( TSS2_RC Tss2_Sys_TestParms_Complete ( TSS2_SYS_CONTEXT *sysContext) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); if (!ctx) return TSS2_SYS_RC_BAD_REFERENCE; @@ -58,7 +58,7 @@ TSS2_RC Tss2_Sys_TestParms( const TPMT_PUBLIC_PARMS *parameters, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!parameters) diff --git a/src/tss2-sys/api/Tss2_Sys_Unseal.c b/src/tss2-sys/api/Tss2_Sys_Unseal.c index 650af9604..ec9408839 100644 --- a/src/tss2-sys/api/Tss2_Sys_Unseal.c +++ b/src/tss2-sys/api/Tss2_Sys_Unseal.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_Unseal_Prepare( TSS2_SYS_CONTEXT *sysContext, TPMI_DH_OBJECT itemHandle) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -45,7 +45,7 @@ TSS2_RC Tss2_Sys_Unseal_Complete( TSS2_SYS_CONTEXT *sysContext, TPM2B_SENSITIVE_DATA *outData) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -68,7 +68,7 @@ TSS2_RC Tss2_Sys_Unseal( TPM2B_SENSITIVE_DATA *outData, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_Unseal_Prepare(sysContext, itemHandle); diff --git a/src/tss2-sys/api/Tss2_Sys_Vendor_TCG_Test.c b/src/tss2-sys/api/Tss2_Sys_Vendor_TCG_Test.c index 663729c20..49706734e 100644 --- a/src/tss2-sys/api/Tss2_Sys_Vendor_TCG_Test.c +++ b/src/tss2-sys/api/Tss2_Sys_Vendor_TCG_Test.c @@ -18,7 +18,7 @@ TSS2_RC Tss2_Sys_Vendor_TCG_Test_Prepare( TSS2_SYS_CONTEXT *sysContext, const TPM2B_DATA *inputData) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -54,7 +54,7 @@ TSS2_RC Tss2_Sys_Vendor_TCG_Test_Complete( TSS2_SYS_CONTEXT *sysContext, TPM2B_DATA *outputData) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -76,7 +76,7 @@ TSS2_RC Tss2_Sys_Vendor_TCG_Test( TPM2B_DATA *outputData, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_Vendor_TCG_Test_Prepare(sysContext, inputData); diff --git a/src/tss2-sys/api/Tss2_Sys_VerifySignature.c b/src/tss2-sys/api/Tss2_Sys_VerifySignature.c index fb5ea163f..0230d331e 100644 --- a/src/tss2-sys/api/Tss2_Sys_VerifySignature.c +++ b/src/tss2-sys/api/Tss2_Sys_VerifySignature.c @@ -20,7 +20,7 @@ TSS2_RC Tss2_Sys_VerifySignature_Prepare( const TPM2B_DIGEST *digest, const TPMT_SIGNATURE *signature) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx || !signature) @@ -69,7 +69,7 @@ TSS2_RC Tss2_Sys_VerifySignature_Complete( TSS2_SYS_CONTEXT *sysContext, TPMT_TK_VERIFIED *validation) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -93,7 +93,7 @@ TSS2_RC Tss2_Sys_VerifySignature( TPMT_TK_VERIFIED *validation, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!signature) diff --git a/src/tss2-sys/api/Tss2_Sys_ZGen_2Phase.c b/src/tss2-sys/api/Tss2_Sys_ZGen_2Phase.c index 2722b821a..22bb95138 100644 --- a/src/tss2-sys/api/Tss2_Sys_ZGen_2Phase.c +++ b/src/tss2-sys/api/Tss2_Sys_ZGen_2Phase.c @@ -22,7 +22,7 @@ TSS2_RC Tss2_Sys_ZGen_2Phase_Prepare( TPMI_ECC_KEY_EXCHANGE inScheme, UINT16 counter) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -93,7 +93,7 @@ TSS2_RC Tss2_Sys_ZGen_2Phase_Complete( TPM2B_ECC_POINT *outZ1, TPM2B_ECC_POINT *outZ2) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; if (!ctx) @@ -126,7 +126,7 @@ TSS2_RC Tss2_Sys_ZGen_2Phase( TPM2B_ECC_POINT *outZ2, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); TSS2_RC rval; rval = Tss2_Sys_ZGen_2Phase_Prepare(sysContext, keyA, inQsB, inQeB, diff --git a/src/tss2-sys/sysapi_util.c b/src/tss2-sys/sysapi_util.c index a551c099b..685823c8d 100644 --- a/src/tss2-sys/sysapi_util.c +++ b/src/tss2-sys/sysapi_util.c @@ -19,7 +19,7 @@ #define LOGMODULE sys #include "util/log.h" -void InitSysContextFields(_TSS2_SYS_CONTEXT_BLOB *ctx) +void InitSysContextFields(TSS2_SYS_CONTEXT_BLOB *ctx) { ctx->decryptAllowed = 0; ctx->encryptAllowed = 0; @@ -29,19 +29,19 @@ void InitSysContextFields(_TSS2_SYS_CONTEXT_BLOB *ctx) } void InitSysContextPtrs( - _TSS2_SYS_CONTEXT_BLOB *ctx, + TSS2_SYS_CONTEXT_BLOB *ctx, size_t contextSize) { - ctx->cmdBuffer = (UINT8 *)ctx + sizeof(_TSS2_SYS_CONTEXT_BLOB); - ctx->maxCmdSize = contextSize - sizeof(_TSS2_SYS_CONTEXT_BLOB); + ctx->cmdBuffer = (UINT8 *)ctx + sizeof(TSS2_SYS_CONTEXT_BLOB); + ctx->maxCmdSize = contextSize - sizeof(TSS2_SYS_CONTEXT_BLOB); } -UINT32 GetCommandSize(_TSS2_SYS_CONTEXT_BLOB *ctx) +UINT32 GetCommandSize(TSS2_SYS_CONTEXT_BLOB *ctx) { return BE_TO_HOST_32(req_header_from_cxt(ctx)->commandSize); } -TSS2_RC CopyCommandHeader(_TSS2_SYS_CONTEXT_BLOB *ctx, TPM2_CC commandCode) +TSS2_RC CopyCommandHeader(TSS2_SYS_CONTEXT_BLOB *ctx, TPM2_CC commandCode) { TSS2_RC rval; @@ -65,7 +65,7 @@ static int GetNumCommandHandles(TPM2_CC commandCode); static int GetNumResponseHandles(TPM2_CC commandCode); TSS2_RC CommonPreparePrologue( - _TSS2_SYS_CONTEXT_BLOB *ctx, + TSS2_SYS_CONTEXT_BLOB *ctx, TPM2_CC commandCode) { int numCommandHandles; @@ -97,7 +97,7 @@ TSS2_RC CommonPreparePrologue( return rval; } -TSS2_RC CommonPrepareEpilogue(_TSS2_SYS_CONTEXT_BLOB *ctx) +TSS2_RC CommonPrepareEpilogue(TSS2_SYS_CONTEXT_BLOB *ctx) { ctx->cpBufferUsedSize = ctx->cmdBuffer + ctx->nextData - ctx->cpBuffer; req_header_from_cxt(ctx)->commandSize = HOST_TO_BE_32(ctx->nextData); @@ -106,7 +106,7 @@ TSS2_RC CommonPrepareEpilogue(_TSS2_SYS_CONTEXT_BLOB *ctx) return TSS2_RC_SUCCESS; } -TSS2_RC CommonComplete(_TSS2_SYS_CONTEXT_BLOB *ctx) +TSS2_RC CommonComplete(TSS2_SYS_CONTEXT_BLOB *ctx) { UINT32 rspSize; TPM2_ST tag; @@ -144,7 +144,7 @@ TSS2_RC CommonComplete(_TSS2_SYS_CONTEXT_BLOB *ctx) } TSS2_RC CommonOneCall( - _TSS2_SYS_CONTEXT_BLOB *ctx, + TSS2_SYS_CONTEXT_BLOB *ctx, TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray) { @@ -293,7 +293,7 @@ static int GetNumHandles(TPM2_CC commandCode, bool req) { TPM2_CC_CertifyX509, 2, 0 } }; - uint8_t i; + size_t i; for (i = 0; i < sizeof(commandArray) / sizeof(COMMAND_HANDLES); i++) { if (commandCode == commandArray[i].commandCode) { diff --git a/src/tss2-sys/sysapi_util.h b/src/tss2-sys/sysapi_util.h index 3457b3558..43fd29d37 100644 --- a/src/tss2-sys/sysapi_util.h +++ b/src/tss2-sys/sysapi_util.h @@ -20,13 +20,13 @@ enum cmdStates {CMD_STAGE_INITIALIZE, CMD_STAGE_ALL = 0xff }; #pragma pack(push, 1) -typedef struct _TPM20_Header_In { +typedef struct TPM20_Header_In { TPM2_ST tag; UINT32 commandSize; UINT32 commandCode; } TPM20_Header_In; -typedef struct _TPM20_Header_Out { +typedef struct TPM20_Header_Out { TPM2_ST tag; UINT32 responseSize; UINT32 responseCode; @@ -58,22 +58,22 @@ typedef struct { /* Offset to next data in command/response buffer. */ size_t nextData; -} _TSS2_SYS_CONTEXT_BLOB; +} TSS2_SYS_CONTEXT_BLOB; -static inline _TSS2_SYS_CONTEXT_BLOB * +static inline TSS2_SYS_CONTEXT_BLOB * syscontext_cast(TSS2_SYS_CONTEXT *ctx) { - return (_TSS2_SYS_CONTEXT_BLOB*) ctx; + return (TSS2_SYS_CONTEXT_BLOB*) ctx; } static inline TPM20_Header_Out * -resp_header_from_cxt(_TSS2_SYS_CONTEXT_BLOB *ctx) +resp_header_from_cxt(TSS2_SYS_CONTEXT_BLOB *ctx) { return (TPM20_Header_Out *)ctx->cmdBuffer; } static inline TPM20_Header_In * -req_header_from_cxt(_TSS2_SYS_CONTEXT_BLOB *ctx) +req_header_from_cxt(TSS2_SYS_CONTEXT_BLOB *ctx) { return (TPM20_Header_In *)ctx->cmdBuffer; } @@ -88,23 +88,23 @@ typedef struct { extern "C" { #endif -TSS2_RC CopyCommandHeader(_TSS2_SYS_CONTEXT_BLOB *ctx, TPM2_CC commandCode); -UINT32 GetCommandSize(_TSS2_SYS_CONTEXT_BLOB *ctx); -void InitSysContextFields(_TSS2_SYS_CONTEXT_BLOB *ctx); -void InitSysContextPtrs(_TSS2_SYS_CONTEXT_BLOB *ctx, size_t contextSize); -TSS2_RC CompleteChecks(_TSS2_SYS_CONTEXT_BLOB *ctx); -TSS2_RC CommonComplete(_TSS2_SYS_CONTEXT_BLOB *ctx); +TSS2_RC CopyCommandHeader(TSS2_SYS_CONTEXT_BLOB *ctx, TPM2_CC commandCode); +UINT32 GetCommandSize(TSS2_SYS_CONTEXT_BLOB *ctx); +void InitSysContextFields(TSS2_SYS_CONTEXT_BLOB *ctx); +void InitSysContextPtrs(TSS2_SYS_CONTEXT_BLOB *ctx, size_t contextSize); +TSS2_RC CompleteChecks(TSS2_SYS_CONTEXT_BLOB *ctx); +TSS2_RC CommonComplete(TSS2_SYS_CONTEXT_BLOB *ctx); TSS2_RC CommonOneCall( - _TSS2_SYS_CONTEXT_BLOB *ctx, + TSS2_SYS_CONTEXT_BLOB *ctx, TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray, TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray); TSS2_RC CommonPreparePrologue( - _TSS2_SYS_CONTEXT_BLOB *ctx, + TSS2_SYS_CONTEXT_BLOB *ctx, TPM2_CC commandCode); -TSS2_RC CommonPrepareEpilogue(_TSS2_SYS_CONTEXT_BLOB *ctx); +TSS2_RC CommonPrepareEpilogue(TSS2_SYS_CONTEXT_BLOB *ctx); #ifdef DISABLE_WEAK_CRYPTO bool IsAlgorithmWeak(TPM2_ALG_ID algorith, TPM2_KEY_SIZE key_size); diff --git a/src/tss2-tcti/mpsse/mpsse.c b/src/tss2-tcti/mpsse/mpsse.c index ea56e3cfb..47fad8c3b 100644 --- a/src/tss2-tcti/mpsse/mpsse.c +++ b/src/tss2-tcti/mpsse/mpsse.c @@ -490,16 +490,14 @@ const char *ErrorString (struct mpsse_context *mpsse) * * Returns the existing clock rate in hertz. */ -int GetClock (struct mpsse_context *mpsse) +uint32_t GetClock (struct mpsse_context *mpsse) { - int clock = 0; - - if (is_valid_context (mpsse)) + if (! is_valid_context (mpsse)) { - clock = mpsse->clock; + return 0; } - return clock; + return mpsse->clock; } /* @@ -920,7 +918,7 @@ char ReadBits (struct mpsse_context *mpsse, int size) * In MSB mode, bits are sifted in from the left. If less than 8 bits were * read, we need to shift them left accordingly. */ - bits = bits << (8-size); + bits = (char) ((bits << (8-size)) & 0xff); } else if (mpsse->endianess == LSB) { @@ -928,7 +926,7 @@ char ReadBits (struct mpsse_context *mpsse, int size) * In LSB mode, bits are shifted in from the right. If less than 8 bits were * read, we need to shift them right accordingly. */ - bits = bits >> (8-size); + bits = (char) ((bits >> (8-size)) & 0xff); } free (rdata); diff --git a/src/tss2-tcti/mpsse/mpsse.h b/src/tss2-tcti/mpsse/mpsse.h index 69469ddd6..d36321174 100644 --- a/src/tss2-tcti/mpsse/mpsse.h +++ b/src/tss2-tcti/mpsse/mpsse.h @@ -28,8 +28,8 @@ * All rights reserved. * SPDX short identifier: BSD-2-Clause */ -#ifndef _LIBMPSSE_H_ -#define _LIBMPSSE_H_ +#ifndef LIBMPSSE_H_ +#define LIBMPSSE_H_ #include @@ -44,7 +44,7 @@ #endif #define MPSSE_OK 0 -#define MPSSE_FAIL -1 +#define MPSSE_FAIL (-1) #define MSB 0x00 #define LSB 0x08 @@ -188,7 +188,7 @@ struct mpsse_context int flush_after_read; int vid; int pid; - int clock; + uint32_t clock; int xsize; int open; int endianess; @@ -214,7 +214,7 @@ const char *ErrorString (struct mpsse_context *mpsse); int SetMode (struct mpsse_context *mpsse, int endianess); void EnableBitmode (struct mpsse_context *mpsse, int tf); int SetClock (struct mpsse_context *mpsse, uint32_t freq); -int GetClock (struct mpsse_context *mpsse); +uint32_t GetClock (struct mpsse_context *mpsse); int GetVid (struct mpsse_context *mpsse); int GetPid (struct mpsse_context *mpsse); const char *GetDescription (struct mpsse_context *mpsse); diff --git a/src/tss2-tcti/mpsse/support.c b/src/tss2-tcti/mpsse/support.c index 33b6c2c85..1d58803e0 100644 --- a/src/tss2-tcti/mpsse/support.c +++ b/src/tss2-tcti/mpsse/support.c @@ -226,27 +226,27 @@ unsigned char *build_block_buffer (struct mpsse_context *mpsse, uint8_t cmd, uns } /* Set the low bit pins high/low */ -int set_bits_low (struct mpsse_context *mpsse, int port) +int set_bits_low (struct mpsse_context *mpsse, uint8_t port) { - char buf[CMD_SIZE] = { 0 }; + uint8_t buf[CMD_SIZE] = { 0 }; buf[0] = SET_BITS_LOW; buf[1] = port; buf[2] = mpsse->tris; - return raw_write (mpsse, (unsigned char *) &buf, sizeof (buf)); + return raw_write (mpsse, buf, sizeof (buf)); } /* Set the high bit pins high/low */ -int set_bits_high (struct mpsse_context *mpsse, int port) +int set_bits_high (struct mpsse_context *mpsse, uint8_t port) { - char buf[CMD_SIZE] = { 0 }; + uint8_t buf[CMD_SIZE] = { 0 }; buf[0] = SET_BITS_HIGH; buf[1] = port; buf[2] = mpsse->trish; - return raw_write (mpsse, (unsigned char *)&buf, sizeof (buf)); + return raw_write (mpsse, buf, sizeof (buf)); } /* Set the GPIO pins high/low */ diff --git a/src/tss2-tcti/mpsse/support.h b/src/tss2-tcti/mpsse/support.h index 3707a4d5a..ec203fd77 100644 --- a/src/tss2-tcti/mpsse/support.h +++ b/src/tss2-tcti/mpsse/support.h @@ -28,8 +28,8 @@ * All rights reserved. * SPDX short identifier: BSD-2-Clause */ -#ifndef _SUPPORT_H_ -#define _SUPPORT_H_ +#ifndef SUPPORT_H_ +#define SUPPORT_H_ #include // for uint32_t, uint16_t, uint8_t @@ -41,8 +41,8 @@ void set_timeouts (struct mpsse_context *mpsse, int timeout); uint16_t freq2div (uint32_t system_clock, uint32_t freq); uint32_t div2freq (uint32_t system_clock, uint16_t div); unsigned char *build_block_buffer (struct mpsse_context *mpsse, uint8_t cmd, unsigned char *data, int size, int *buf_size); -int set_bits_high (struct mpsse_context *mpsse, int port); -int set_bits_low (struct mpsse_context *mpsse, int port); +int set_bits_high (struct mpsse_context *mpsse, uint8_t port); +int set_bits_low (struct mpsse_context *mpsse, uint8_t port); int gpio_write (struct mpsse_context *mpsse, int pin, int direction); int is_valid_context (struct mpsse_context *mpsse); diff --git a/src/tss2-tcti/tcti-device.c b/src/tss2-tcti/tcti-device.c index bfa6a9411..00045c16d 100644 --- a/src/tss2-tcti/tcti-device.c +++ b/src/tss2-tcti/tcti-device.c @@ -103,7 +103,7 @@ tcti_device_transmit ( TSS2_TCTI_DEVICE_CONTEXT *tcti_dev = tcti_device_context_cast (tctiContext); TSS2_TCTI_COMMON_CONTEXT *tcti_common = tcti_device_down_cast (tcti_dev); TSS2_RC rc = TSS2_RC_SUCCESS; - ssize_t size; + size_t size; rc = tcti_common_transmit_checks (tcti_common, command_buffer, @@ -118,9 +118,7 @@ tcti_device_transmit ( size = write_all (tcti_dev->fd, command_buffer, command_size); - if (size < 0) { - return TSS2_TCTI_RC_IO_ERROR; - } else if ((size_t)size != command_size) { + if (size != command_size) { LOG_ERROR ("wrong number of bytes written. Expected %zu, wrote %zd.", command_size, size); @@ -467,8 +465,8 @@ Tss2_Tcti_Device_Init ( struct pollfd fds; int rc_poll, nfds = 1; - ssize_t sz = write_all (tcti_dev->fd, cmd, sizeof(cmd)); - if (sz < 0 || sz != sizeof(cmd)) { + ssize_t sz = (ssize_t) write_all (tcti_dev->fd, cmd, sizeof(cmd)); + if (sz != sizeof(cmd)) { LOG_ERROR ("Could not probe device for partial response read support"); close_tpm (&tcti_dev->fd); return TSS2_TCTI_RC_IO_ERROR; diff --git a/src/tss2-tcti/tcti-i2c-ftdi.c b/src/tss2-tcti/tcti-i2c-ftdi.c index dbeae1d30..d07b69de3 100644 --- a/src/tss2-tcti/tcti-i2c-ftdi.c +++ b/src/tss2-tcti/tcti-i2c-ftdi.c @@ -124,7 +124,7 @@ platform_i2c_write (void *user_data, uint8_t reg_addr, const void *data, size_t goto error; } - if (Write (mpsse, (char *)data, cnt) != MPSSE_OK) + if (Write (mpsse, (char *)data, (int) cnt) != MPSSE_OK) { goto error; } @@ -186,7 +186,7 @@ platform_i2c_read (void *user_data, uint8_t reg_addr, void *data, size_t cnt) /* Read in (cnt - 1) bytes with ACK */ SendAcks (mpsse); - if ((data_in = Read (mpsse, cnt - 1)) == NULL) + if ((data_in = Read (mpsse, (int) cnt - 1)) == NULL) { goto error; } diff --git a/src/tss2-tcti/tcti-i2c-helper.c b/src/tss2-tcti/tcti-i2c-helper.c index b7720d64e..8458dffeb 100644 --- a/src/tss2-tcti/tcti-i2c-helper.c +++ b/src/tss2-tcti/tcti-i2c-helper.c @@ -86,8 +86,8 @@ static const uint16_t crc16_kermit_lookup[256]= { 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78 }; -static uint16_t crc_ccitt (const uint8_t *buffer, int size) { - int i; +static uint16_t crc_ccitt (const uint8_t *buffer, size_t size) { + size_t i; uint16_t result = 0; for (i = 0; i < size; i++) { @@ -475,8 +475,6 @@ static TSS2_RC i2c_tpm_helper_wait_for_status (TSS2_TCTI_I2C_HELPER_CONTEXT* ctx static TSS2_RC i2c_tpm_helper_verify_crc (TSS2_TCTI_I2C_HELPER_CONTEXT* ctx, const uint8_t* buffer, size_t size) { - (void) buffer; - (void) size; TSS2_RC rc; uint16_t crc_tpm = 0; uint16_t crc_host = 0; diff --git a/src/tss2-tcti/tcti-i2c-helper.h b/src/tss2-tcti/tcti-i2c-helper.h index 2e545b73b..2028dc660 100644 --- a/src/tss2-tcti/tcti-i2c-helper.h +++ b/src/tss2-tcti/tcti-i2c-helper.h @@ -36,7 +36,7 @@ typedef struct { TSS2_TCTI_I2C_HELPER_PLATFORM platform; bool guard_time_read; bool guard_time_write; - int guard_time; + uint8_t guard_time; char header[TCTI_I2C_HELPER_RESP_HEADER_SIZE]; } TSS2_TCTI_I2C_HELPER_CONTEXT; diff --git a/src/tss2-tcti/tcti-libtpms.c b/src/tss2-tcti/tcti-libtpms.c index 5f4fcb130..517d1684d 100644 --- a/src/tss2-tcti/tcti-libtpms.c +++ b/src/tss2-tcti/tcti-libtpms.c @@ -94,7 +94,7 @@ tcti_libtpms_map_state_file(TSS2_TCTI_LIBTPMS_CONTEXT *tcti_libtpms) tcti_libtpms->state_mmap_len = (file_len / STATE_MMAP_CHUNK_LEN + 1) * STATE_MMAP_CHUNK_LEN; /* allocate disk space */ - ret = posix_fallocate(state_fd, 0, tcti_libtpms->state_mmap_len); + ret = posix_fallocate(state_fd, 0, (off_t) tcti_libtpms->state_mmap_len); if (ret != 0) { LOG_ERROR("fallocate failed on file %s: %d",tcti_libtpms->state_path, ret); rc = TSS2_TCTI_RC_IO_ERROR; @@ -177,7 +177,7 @@ tcti_libtpms_ensure_state_len( return TSS2_TCTI_RC_IO_ERROR; } - ret = posix_fallocate(state_fd, 0, tcti_libtpms->state_mmap_len); + ret = posix_fallocate(state_fd, 0, (off_t) tcti_libtpms->state_mmap_len); if (ret != 0) { LOG_ERROR("fallocate failed on file %s: %d",tcti_libtpms->state_path, ret); close(state_fd); @@ -493,7 +493,7 @@ tcti_libtpms_finalize( if (tcti_libtpms->state_path != NULL) { /* truncate state file to its real size */ - ret = truncate(tcti_libtpms->state_path, tcti_libtpms->state_len); + ret = truncate(tcti_libtpms->state_path, (off_t) tcti_libtpms->state_len); if (ret != 0) { LOG_WARNING("truncate failed on file %s: %s", tcti_libtpms->state_path, diff --git a/src/tss2-tcti/tcti-mssim.c b/src/tss2-tcti/tcti-mssim.c index a4df730ea..751716de5 100644 --- a/src/tss2-tcti/tcti-mssim.c +++ b/src/tss2-tcti/tcti-mssim.c @@ -68,7 +68,7 @@ TSS2_RC tcti_platform_command ( uint8_t buf [sizeof (cmd)] = { 0 }; UINT32 rsp = 0; TSS2_RC rc = TSS2_RC_SUCCESS; - int ret; + size_t ret; ssize_t read_ret; if (tcti_mssim == NULL) { @@ -89,8 +89,8 @@ TSS2_RC tcti_platform_command ( LOGBLOB_DEBUG(buf, sizeof (cmd), "Sending %zu bytes to socket %" PRIu32 ":", sizeof (cmd), tcti_mssim->platform_sock); ret = write_all (tcti_mssim->platform_sock, buf, sizeof (cmd)); - if (ret < (ssize_t) sizeof (cmd)) { - LOG_ERROR("Failed to send platform command %d with error: %d", + if (ret < sizeof (cmd)) { + LOG_ERROR("Failed to send platform command %d with error: %zd", cmd, ret); return TSS2_TCTI_RC_IO_ERROR; } @@ -331,7 +331,6 @@ tcti_mssim_receive ( TSS2_TCTI_COMMON_CONTEXT *tcti_common = tcti_mssim_down_cast (tcti_mssim); TSS2_RC rc; UINT32 trash; - int ret; rc = tcti_common_receive_checks (tcti_common, response_size, @@ -357,16 +356,15 @@ tcti_mssim_receive ( /* Receive the size of the response. */ uint8_t size_buf [sizeof (UINT32)]; - ret = socket_poll(tcti_mssim->tpm_sock, timeout); - if (ret != TSS2_RC_SUCCESS) { - if (ret == TSS2_TCTI_RC_TRY_AGAIN) { - return ret; + rc = socket_poll(tcti_mssim->tpm_sock, timeout); + if (rc != TSS2_RC_SUCCESS) { + if (rc == TSS2_TCTI_RC_TRY_AGAIN) { + return rc; } - rc = ret; goto out; } - ret = socket_recv_buf (tcti_mssim->tpm_sock, size_buf, sizeof(UINT32)); - if (ret != sizeof (UINT32)) { + rc = socket_recv_buf (tcti_mssim->tpm_sock, size_buf, sizeof(UINT32)); + if (rc != sizeof (UINT32)) { rc = TSS2_TCTI_RC_IO_ERROR; goto out; } @@ -397,46 +395,50 @@ tcti_mssim_receive ( /* Receive the TPM response. */ LOG_DEBUG ("Reading response of size %" PRIu32, tcti_common->header.size); - ret = socket_poll(tcti_mssim->tpm_sock, timeout); - if (ret != TSS2_RC_SUCCESS) { - if (ret == TSS2_TCTI_RC_TRY_AGAIN) { - return ret; + rc = socket_poll(tcti_mssim->tpm_sock, timeout); + if (rc != TSS2_RC_SUCCESS) { + if (rc == TSS2_TCTI_RC_TRY_AGAIN) { + return rc; } - rc = ret; goto out; } - ret = socket_recv_buf (tcti_mssim->tpm_sock, + rc = socket_recv_buf (tcti_mssim->tpm_sock, (unsigned char *)response_buffer, tcti_common->header.size); - if (ret < (ssize_t)tcti_common->header.size) { + if (rc < (ssize_t)tcti_common->header.size) { rc = TSS2_TCTI_RC_IO_ERROR; goto out; } LOGBLOB_DEBUG(response_buffer, tcti_common->header.size, "Response buffer received:"); - ret = socket_poll (tcti_mssim->tpm_sock, timeout); - if (ret != TSS2_RC_SUCCESS) { - if (ret == TSS2_TCTI_RC_TRY_AGAIN) { - return ret; + rc = socket_poll (tcti_mssim->tpm_sock, timeout); + if (rc != TSS2_RC_SUCCESS) { + if (rc == TSS2_TCTI_RC_TRY_AGAIN) { + return rc; } - rc = ret; goto out; } /* Receive the appended four bytes of 0's */ - ret = socket_recv_buf (tcti_mssim->tpm_sock, + rc = socket_recv_buf (tcti_mssim->tpm_sock, (unsigned char *)&trash, 4); - if (ret != 4) { - LOG_DEBUG ("Error reading last 4 bytes %" PRIu32, ret); + if (rc != 4) { + LOG_DEBUG ("Error reading last 4 bytes %" PRIu32, rc); rc = TSS2_TCTI_RC_IO_ERROR; goto out; } if (tcti_mssim->cancel) { rc = tcti_platform_command (tctiContext, MS_SIM_CANCEL_OFF); + if (rc != TSS2_RC_SUCCESS) { + return rc; + } tcti_mssim->cancel = 0; } + + rc = TSS2_RC_SUCCESS; + /* * Executing code beyond this point transitions the state machine to * TRANSMIT. Another call to this function will not be possible until diff --git a/src/tss2-tcti/tcti-mssim.h b/src/tss2-tcti/tcti-mssim.h index c7f7b9b53..037f308a8 100644 --- a/src/tss2-tcti/tcti-mssim.h +++ b/src/tss2-tcti/tcti-mssim.h @@ -16,9 +16,9 @@ /* * longest possible conf string: - * HOST_NAME_MAX + max char uint16 (5) + strlen ("host=,port=") (11) + * POSIX_HOST_NAME_MAX + max char uint16 (5) + strlen ("host=,port=") (11) */ -#define TCTI_MSSIM_CONF_MAX (_HOST_NAME_MAX + 16) +#define TCTI_MSSIM_CONF_MAX (POSIX_HOST_NAME_MAX + 16) #define TCTI_MSSIM_DEFAULT_HOST "localhost" #define TCTI_MSSIM_DEFAULT_PORT 2321 #define TCTI_MSSIM_DEFAULT_PATH NULL diff --git a/src/tss2-tcti/tcti-pcap-builder.c b/src/tss2-tcti/tcti-pcap-builder.c index 933f52bce..dfa574b5e 100644 --- a/src/tss2-tcti/tcti-pcap-builder.c +++ b/src/tss2-tcti/tcti-pcap-builder.c @@ -56,7 +56,7 @@ #define TCP_URGENT_PTR_UNUSED 0x0000 #define SIZEOF_IN_OCTETS(x) (sizeof (x)/sizeof (uint32_t)) -#define TO_MULTIPLE_OF_4_BYTE(x) (((x)-1)/4*4+4) * !!(x) +#define TO_MULTIPLE_OF_4_BYTE(x) ((((x)-1)/4*4+4) * !!(x)) /* * complies to pcap-ng (IETF RFC draft-tuexen-opsawg-pcapng-01) @@ -439,7 +439,7 @@ pcap_write_enhanced_packet_block ( memcpy (buf, &footer, sizeof (epb_footer)); } - return pdu_len; + return (int) pdu_len; } static int @@ -491,7 +491,7 @@ pcap_write_ip_packet ( direction); } - return pdu_len; + return (int) pdu_len; } static int @@ -547,5 +547,5 @@ pcap_write_tcp_segment ( } } - return pdu_len; + return (int) pdu_len; } diff --git a/src/tss2-tcti/tcti-spi-ftdi.c b/src/tss2-tcti/tcti-spi-ftdi.c index 5c64cd964..e25646748 100644 --- a/src/tss2-tcti/tcti-spi-ftdi.c +++ b/src/tss2-tcti/tcti-spi-ftdi.c @@ -97,7 +97,7 @@ platform_timeout_expired (void *user_data, bool *is_timeout_expired) TSS2_RC platform_spi_transfer (void *user_data, const void *data_out, void *data_in, size_t cnt) { - int length = cnt; + size_t length = cnt; PLATFORM_USERDATA *platform_data = (PLATFORM_USERDATA *) user_data; struct mpsse_context *mpsse = platform_data->mpsse; char *data = NULL; @@ -106,7 +106,7 @@ platform_spi_transfer (void *user_data, const void *data_out, void *data_in, siz return TSS2_TCTI_RC_IO_ERROR; } - if ((data = Transfer (mpsse, (char *)data_out, length)) == NULL) { + if ((data = Transfer (mpsse, (char *)data_out, (int) length)) == NULL) { Stop (mpsse); return TSS2_TCTI_RC_IO_ERROR; } diff --git a/src/tss2-tcti/tcti-spi-ltt2go.c b/src/tss2-tcti/tcti-spi-ltt2go.c index 1ab4f6f0e..f8fd40351 100644 --- a/src/tss2-tcti/tcti-spi-ltt2go.c +++ b/src/tss2-tcti/tcti-spi-ltt2go.c @@ -73,7 +73,7 @@ platform_spi_transfer (void *user_data, const void *data_out, void *data_in, siz } while (transfered != cnt){ - ret = libusb_bulk_transfer (dev_handle, EP_OUT, spi_dma_buffer+transfered, length, &act_len, TIMEOUT); + ret = libusb_bulk_transfer (dev_handle, EP_OUT, spi_dma_buffer+transfered, (int) length, &act_len, TIMEOUT); if (ret) { LOG_ERROR ("libusb_bulk_transfer write failed with error: %s.", libusb_strerror(ret)); ret = TSS2_TCTI_RC_IO_ERROR; @@ -86,7 +86,7 @@ platform_spi_transfer (void *user_data, const void *data_out, void *data_in, siz transfered = 0; length = cnt; while(transfered != cnt){ - ret = libusb_bulk_transfer (dev_handle, EP_IN, spi_dma_buffer+transfered, length, &act_len, TIMEOUT); + ret = libusb_bulk_transfer (dev_handle, EP_IN, spi_dma_buffer+transfered, (int) length, &act_len, TIMEOUT); if (ret) { if (retry++ > 5) { LOG_ERROR ("libusb_bulk_transfer read failed with error: %s.", libusb_strerror(ret)); diff --git a/src/tss2-tcti/tcti-swtpm.c b/src/tss2-tcti/tcti-swtpm.c index 74a8971a0..b9e75d26d 100644 --- a/src/tss2-tcti/tcti-swtpm.c +++ b/src/tss2-tcti/tcti-swtpm.c @@ -114,7 +114,7 @@ TSS2_RC tcti_control_command ( { TSS2_TCTI_SWTPM_CONTEXT *tcti_swtpm = tcti_swtpm_context_cast(tctiContext); TSS2_RC rc = TSS2_RC_SUCCESS; - int ret; + size_t ret; uint32_t response_code; if (tcti_swtpm == NULL) { @@ -174,8 +174,8 @@ TSS2_RC tcti_control_command ( LOGBLOB_DEBUG(req_buf, req_buf_len, "Sending %zu bytes to socket %" PRIu32 ":", req_buf_len, tcti_swtpm->ctrl_sock); ret = write_all (tcti_swtpm->ctrl_sock, req_buf, req_buf_len); - if (ret < (ssize_t) req_buf_len) { - LOG_ERROR("Failed to send control command %d with error: %d", + if (ret < req_buf_len) { + LOG_ERROR("Failed to send control command %d with error: %zd", cmd_code, ret); rc = TSS2_TCTI_RC_IO_ERROR; goto out; @@ -393,7 +393,7 @@ tcti_swtpm_receive ( TSS2_TCTI_SWTPM_CONTEXT *tcti_swtpm = tcti_swtpm_context_cast (tctiContext); TSS2_TCTI_COMMON_CONTEXT *tcti_common = tcti_swtpm_down_cast (tcti_swtpm); TSS2_RC rc; - int ret; + size_t ret; rc = tcti_common_receive_checks (tcti_common, response_size, TCTI_SWTPM_MAGIC); if (rc != TSS2_RC_SUCCESS) { @@ -448,7 +448,7 @@ tcti_swtpm_receive ( ret = socket_recv_buf (tcti_swtpm->tpm_sock, (unsigned char *)&response_buffer[10], tcti_common->header.size - 10); - if (ret < (ssize_t)tcti_common->header.size - 10) { + if (ret < tcti_common->header.size - 10) { rc = TSS2_TCTI_RC_IO_ERROR; goto out; } diff --git a/src/tss2-tcti/tcti-swtpm.h b/src/tss2-tcti/tcti-swtpm.h index 76e0c6700..ec8d0a7d4 100644 --- a/src/tss2-tcti/tcti-swtpm.h +++ b/src/tss2-tcti/tcti-swtpm.h @@ -15,9 +15,9 @@ /* * longest possible conf string: - * HOST_NAME_MAX + max char uint16 (5) + strlen ("host=,port=") (11) + * POSIX_HOST_NAME_MAX + max char uint16 (5) + strlen ("host=,port=") (11) */ -#define TCTI_SWTPM_CONF_MAX (_HOST_NAME_MAX + 16) +#define TCTI_SWTPM_CONF_MAX (POSIX_HOST_NAME_MAX + 16) #define TCTI_SWTPM_DEFAULT_HOST "localhost" #define TCTI_SWTPM_DEFAULT_PORT 2321 #define TCTI_SWTPM_DEFAULT_PATH NULL diff --git a/src/tss2-tcti/tctildr-dl.c b/src/tss2-tcti/tctildr-dl.c index 2bbb5e281..a2836cfde 100644 --- a/src/tss2-tcti/tctildr-dl.c +++ b/src/tss2-tcti/tctildr-dl.c @@ -21,7 +21,7 @@ #define LOGMODULE tcti #include "util/log.h" // for LOG_ERROR, LOG_DEBUG, LOG_TRACE -#define ARRAY_SIZE(X) (sizeof(X)/sizeof(X[0])) +#define ARRAY_SIZE(X) (sizeof(X)/sizeof((X)[0])) struct { char *file; diff --git a/src/tss2-tcti/tctildr-nodl.c b/src/tss2-tcti/tctildr-nodl.c index 992b4d379..bb8018834 100644 --- a/src/tss2-tcti/tctildr-nodl.c +++ b/src/tss2-tcti/tctildr-nodl.c @@ -50,7 +50,7 @@ #define LOGMODULE tcti #include "util/log.h" // for LOG_ERROR, LOG_DEBUG -#define ARRAY_SIZE(X) (sizeof(X)/sizeof(X[0])) +#define ARRAY_SIZE(X) (sizeof(X)/sizeof((X)[0])) #define NAME_ARRAY_SIZE 3 struct { @@ -196,7 +196,7 @@ tctildr_get_tcti (const char *name, for (size_t i = 0; i < ARRAY_SIZE(tctis); ++i) { #pragma GCC diagnostic pop for (size_t j = 0; j < NAME_ARRAY_SIZE; ++j) { - if (strcmp (name, tctis[i].names[j])) + if (strcmp (name, tctis[i].names[j]) != 0) continue; LOG_DEBUG("initializing TCTI with name \"%s\"", tctis[i].names[j]); diff --git a/src/tss2-tcti/tctildr.c b/src/tss2-tcti/tctildr.c index bb23cdb80..6a091fc5f 100644 --- a/src/tss2-tcti/tctildr.c +++ b/src/tss2-tcti/tctildr.c @@ -512,10 +512,10 @@ Tss2_TctiLdr_Initialize_Ex (const char *name, } *tctiContext = NULL; /* Ignore 'name' and 'conf' if they're NULL or empty string */ - if (name != NULL && strcmp (name, "")) { + if (name != NULL && strcmp (name, "") != 0) { local_name = name; } - if (conf != NULL && strcmp (conf, "")) { + if (conf != NULL && strcmp (conf, "") != 0) { local_conf = conf; } ldr_ctx = calloc (1, sizeof (TSS2_TCTILDR_CONTEXT)); diff --git a/src/util-io/io.c b/src/util-io/io.c index 1c2e3c9c3..80385b833 100644 --- a/src/util-io/io.c +++ b/src/util-io/io.c @@ -41,7 +41,7 @@ * once all of the requested data has been read, an error occurs, or EOF. * On error or EOF, the number of bytes read (if any) will be returned. */ -ssize_t +size_t read_all ( SOCKET fd, uint8_t *data, @@ -81,7 +81,7 @@ read_all ( return recvd_total; } -ssize_t +size_t write_all ( SOCKET fd, const uint8_t *buf, @@ -117,10 +117,10 @@ write_all ( } } while (written_total < size); - return (ssize_t)written_total; + return written_total; } -ssize_t +size_t socket_recv_buf ( SOCKET sock, uint8_t *data, @@ -135,11 +135,11 @@ socket_xmit_buf ( const void *buf, size_t size) { - int ret; + size_t ret; LOGBLOB_DEBUG (buf, size, "Writing %zu bytes to socket %d:", size, sock); ret = write_all (sock, buf, size); - if (ret < (ssize_t) size) { + if (ret < size) { #ifdef _WIN32 LOG_ERROR ("write to fd %d failed, errno %d: %s", sock, WSAGetLastError(), strerror (WSAGetLastError())); #else @@ -197,7 +197,7 @@ socket_connect ( char port_str[MAX_PORT_STR_LEN]; int ret = 0; #ifdef _WIN32 - char host_buff[_HOST_NAME_MAX]; + char host_buff[POSIX_HOST_NAME_MAX]; const char *h = hostname; WSADATA wsaData; int iResult; @@ -207,7 +207,7 @@ socket_connect ( return TSS2_TCTI_RC_IO_ERROR; } #else - char host_buff[_HOST_NAME_MAX] __attribute__((unused)); + char host_buff[POSIX_HOST_NAME_MAX] __attribute__((unused)); const char *h __attribute__((unused)) = hostname; #endif diff --git a/src/util-io/io.h b/src/util-io/io.h index 0ce6fdc17..595177d38 100644 --- a/src/util-io/io.h +++ b/src/util-io/io.h @@ -16,16 +16,16 @@ #include typedef SSIZE_T ssize_t; -#define _HOST_NAME_MAX MAX_COMPUTERNAME_LENGTH +#define POSIX_HOST_NAME_MAX MAX_COMPUTERNAME_LENGTH #else #include // for EINTR, errno #include // for size_t, ssize_t -#define _HOST_NAME_MAX _POSIX_HOST_NAME_MAX +#define POSIX_HOST_NAME_MAX _POSIX_HOST_NAME_MAX #define SOCKET int -#define INVALID_SOCKET -1 -#define SOCKET_ERROR -1 +#define INVALID_SOCKET ((-1)) +#define SOCKET_ERROR ((-1)) #endif #ifdef _WIN32 @@ -48,7 +48,7 @@ typedef SSIZE_T ssize_t; do { \ __ret = exp; \ } while (__ret == SOCKET_ERROR && errno == EINTR); \ - dest =__ret; } + ((dest)) =__ret; } #endif #ifdef __cplusplus @@ -61,7 +61,7 @@ extern "C" { * are detected. This is currently limited to interrupted system calls and * short reads. */ -ssize_t +size_t read_all ( SOCKET fd, uint8_t *data, @@ -72,7 +72,7 @@ read_all ( * are detected. This is currently limited to interrupted system calls and * short writes. */ -ssize_t +size_t write_all ( SOCKET fd, const uint8_t *buf, @@ -104,7 +104,7 @@ socket_close ( TSS2_RC socket_set_nonblock ( SOCKET sock); -ssize_t +size_t socket_recv_buf ( SOCKET sock, uint8_t *data, diff --git a/src/util/aux_util.h b/src/util/aux_util.h index 6e7c962be..3e0a8b0af 100644 --- a/src/util/aux_util.h +++ b/src/util/aux_util.h @@ -20,11 +20,11 @@ extern "C" { #define SAFE_FREE(S) if((S) != NULL) {free((void*) (S)); (S)=NULL;} -#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0])) +#define ARRAY_LEN(x) (sizeof(x)/sizeof((x)[0])) #define TPM2_ERROR_FORMAT "%s%s (0x%08"PRIx32")" #define TPM2_ERROR_TEXT(r) "Error", "Code", r -#define SIZE_OF_ARY(ary) (sizeof(ary) / sizeof(ary[0])) +#define SIZE_OF_ARY(ary) (sizeof(ary) / sizeof((ary)[0])) #if defined (__GNUC__) #define COMPILER_ATTR(...) __attribute__((__VA_ARGS__)) @@ -48,13 +48,13 @@ extern "C" { #endif #define return_if_error(r,msg) \ - if (r != TSS2_RC_SUCCESS) { \ + if ((r) != TSS2_RC_SUCCESS) { \ LOG_ERROR("%s " TPM2_ERROR_FORMAT, msg, TPM2_ERROR_TEXT(r)); \ return r; \ } #define return_state_if_error(r,s,msg) \ - if (r != TSS2_RC_SUCCESS) { \ + if ((r) != TSS2_RC_SUCCESS) { \ LOG_ERROR("%s " TPM2_ERROR_FORMAT, msg, TPM2_ERROR_TEXT(r)); \ esysContext->state = s; \ return r; \ @@ -67,7 +67,7 @@ extern "C" { } #define goto_state_if_error(r,s,msg,label) \ - if (r != TSS2_RC_SUCCESS) { \ + if ((r) != TSS2_RC_SUCCESS) { \ LOG_ERROR("%s " TPM2_ERROR_FORMAT, msg, TPM2_ERROR_TEXT(r)); \ esysContext->state = s; \ goto label; \ @@ -81,7 +81,7 @@ extern "C" { } #define goto_if_error(r,msg,label) \ - if (r != TSS2_RC_SUCCESS) { \ + if ((r) != TSS2_RC_SUCCESS) { \ LOG_ERROR("%s " TPM2_ERROR_FORMAT, msg, TPM2_ERROR_TEXT(r)); \ goto label; \ } @@ -93,26 +93,26 @@ extern "C" { } #define return_if_null(p,msg,ec) \ - if (p == NULL) { \ + if ((p) == NULL) { \ LOG_ERROR("%s ", msg); \ return ec; \ } #define return_if_notnull(p,msg,ec) \ - if (p != NULL) { \ + if ((p) != NULL) { \ LOG_ERROR("%s ", msg); \ return ec; \ } #define set_return_code(r_max, r, msg) \ - if (r != TSS2_RC_SUCCESS) { \ + if ((r) != TSS2_RC_SUCCESS) { \ LOG_ERROR("%s " TPM2_ERROR_FORMAT, msg, TPM2_ERROR_TEXT(r)); \ - r_max = r; \ + (r_max) = r; \ } -#define rc_layer(r) (r & TSS2_RC_LAYER_MASK) -#define base_rc(r) (r & ~TSS2_RC_LAYER_MASK) -#define number_rc(r) (r & ~TPM2_RC_N_MASK) +#define rc_layer(r) ((r) & TSS2_RC_LAYER_MASK) +#define base_rc(r) ((r) & ~TSS2_RC_LAYER_MASK) +#define number_rc(r) ((r) & ~TPM2_RC_N_MASK) static inline TSS2_RC tss2_fmt_p1_error_to_rc(UINT16 err) diff --git a/test/fuzz/tcti/tcti-fuzzing.c b/test/fuzz/tcti/tcti-fuzzing.c index 49215bf8d..8b38a3437 100644 --- a/test/fuzz/tcti/tcti-fuzzing.c +++ b/test/fuzz/tcti/tcti-fuzzing.c @@ -71,7 +71,7 @@ fuzz_fill ( void *copy_into_type; size_t copy_into_length = 0U; size_t data_used = 0U; - _TSS2_SYS_CONTEXT_BLOB *ctx = NULL; + TSS2_SYS_CONTEXT_BLOB *ctx = NULL; TSS2_TCTI_FUZZING_CONTEXT *tcti_fuzzing = NULL; ctx = syscontext_cast (sysContext); diff --git a/test/integration/esys-tpm-tests.int.c b/test/integration/esys-tpm-tests.int.c index f3d991c45..76dcbaec1 100644 --- a/test/integration/esys-tpm-tests.int.c +++ b/test/integration/esys-tpm-tests.int.c @@ -33,7 +33,7 @@ test_esys_tpm_tests(ESYS_CONTEXT * esys_context) { TSS2_RC r; - esys_context->state = _ESYS_STATE_INIT; + esys_context->state = ESYS_STATE_INIT; r = Esys_SelfTest(esys_context, ESYS_TR_NONE, ESYS_TR_NONE, ESYS_TR_NONE, 0); goto_if_error(r, "Error SelfTest did fail", error); @@ -41,7 +41,7 @@ test_esys_tpm_tests(ESYS_CONTEXT * esys_context) TPML_ALG alg_list = { .count = 1 , .algorithms = { TPM2_ALG_SHA256 }}; TPML_ALG *toDoList; - esys_context->state = _ESYS_STATE_INIT; + esys_context->state = ESYS_STATE_INIT; r = Esys_IncrementalSelfTest(esys_context, ESYS_TR_NONE, ESYS_TR_NONE, ESYS_TR_NONE, &alg_list, &toDoList); @@ -51,7 +51,7 @@ test_esys_tpm_tests(ESYS_CONTEXT * esys_context) TPM2B_MAX_BUFFER *outData; TPM2_RC testResult; - esys_context->state = _ESYS_STATE_INIT; + esys_context->state = ESYS_STATE_INIT; r = Esys_GetTestResult(esys_context, ESYS_TR_NONE, ESYS_TR_NONE, ESYS_TR_NONE, &outData, &testResult); diff --git a/test/tpmclient/tpmclient.int.c b/test/tpmclient/tpmclient.int.c index 42229d399..aff2c1247 100644 --- a/test/tpmclient/tpmclient.int.c +++ b/test/tpmclient/tpmclient.int.c @@ -1905,7 +1905,7 @@ static void GetSetDecryptParamTests() /* Test for insufficient size. */ /* Create a buffer that is too large */ size_t testBufferSize = TPM2_MAX_COMMAND_SIZE - - BE_TO_HOST_32(((TPM20_Header_In *)(((_TSS2_SYS_CONTEXT_BLOB *)decryptParamTestSysContext)->cmdBuffer))->commandSize) + 1; + BE_TO_HOST_32(((TPM20_Header_In *)(((TSS2_SYS_CONTEXT_BLOB *)decryptParamTestSysContext)->cmdBuffer))->commandSize) + 1; UINT8 testBuffer [testBufferSize]; memset(testBuffer, 0, testBufferSize); memcpy(testBuffer, nvWriteData.buffer, nvWriteData.size); @@ -2037,7 +2037,7 @@ static void GetSetEncryptParamTests() TPM2B_MAX_NV_BUFFER nvReadData; const uint8_t *cpBuffer; - _TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); + TSS2_SYS_CONTEXT_BLOB *ctx = syscontext_cast(sysContext); LOG_INFO("GET/SET ENCRYPT PARAM TESTS:" ); diff --git a/test/unit/CommonPreparePrologue.c b/test/unit/CommonPreparePrologue.c index 8e17a4194..f0124bec2 100644 --- a/test/unit/CommonPreparePrologue.c +++ b/test/unit/CommonPreparePrologue.c @@ -31,14 +31,14 @@ CommonPreparePrologue_null_sys_context_unit (void **state) } /** - * Accessing the _TSS2_SYS_CONTEXT_BLOB directly like this isn't allowed + * Accessing the TSS2_SYS_CONTEXT_BLOB directly like this isn't allowed * in normal code. Use the opaque TSS2_SYS_CONTEXT in user space * applications. In the test cases we do this to induce error conditions. */ static int CommonPreparePrologue_sys_setup (void **state) { - _TSS2_SYS_CONTEXT_BLOB *sys_ctx; + TSS2_SYS_CONTEXT_BLOB *sys_ctx; UINT32 size_ctx; size_ctx = Tss2_Sys_GetContextSize (MAX_SIZE_CTX); @@ -52,7 +52,7 @@ CommonPreparePrologue_sys_setup (void **state) static int CommonPreparePrologue_sys_teardown (void **state) { - _TSS2_SYS_CONTEXT_BLOB *sys_ctx = (_TSS2_SYS_CONTEXT_BLOB*)*state; + TSS2_SYS_CONTEXT_BLOB *sys_ctx = (TSS2_SYS_CONTEXT_BLOB*)*state; if (sys_ctx) free (sys_ctx); @@ -68,7 +68,7 @@ CommonPreparePrologue_sys_teardown (void **state) static void CommonPreparePrologue_previous_stage_initialize (void **state) { - _TSS2_SYS_CONTEXT_BLOB *sys_ctx = (_TSS2_SYS_CONTEXT_BLOB*)*state; + TSS2_SYS_CONTEXT_BLOB *sys_ctx = (TSS2_SYS_CONTEXT_BLOB*)*state; TSS2_RC rc; sys_ctx->previousStage |= ~CMD_STAGE_INITIALIZE; @@ -78,7 +78,7 @@ CommonPreparePrologue_previous_stage_initialize (void **state) static void CommonPreparePrologue_previous_stage_prepare (void **state) { - _TSS2_SYS_CONTEXT_BLOB *sys_ctx = (_TSS2_SYS_CONTEXT_BLOB*)*state; + TSS2_SYS_CONTEXT_BLOB *sys_ctx = (TSS2_SYS_CONTEXT_BLOB*)*state; TSS2_RC rc; sys_ctx->previousStage |= ~CMD_STAGE_RECEIVE_RESPONSE; @@ -88,7 +88,7 @@ CommonPreparePrologue_previous_stage_prepare (void **state) static void CommonPreparePrologue_previous_stage_response (void **state) { - _TSS2_SYS_CONTEXT_BLOB *sys_ctx = (_TSS2_SYS_CONTEXT_BLOB*)*state; + TSS2_SYS_CONTEXT_BLOB *sys_ctx = (TSS2_SYS_CONTEXT_BLOB*)*state; TSS2_RC rc; sys_ctx->previousStage |= ~CMD_STAGE_PREPARE; diff --git a/test/unit/CopyCommandHeader.c b/test/unit/CopyCommandHeader.c index 129ba0574..38e7559aa 100644 --- a/test/unit/CopyCommandHeader.c +++ b/test/unit/CopyCommandHeader.c @@ -25,7 +25,7 @@ static int CopyCommandHeader_sys_setup (void **state) { - _TSS2_SYS_CONTEXT_BLOB *sys_ctx; + TSS2_SYS_CONTEXT_BLOB *sys_ctx; UINT32 size_ctx; size_ctx = Tss2_Sys_GetContextSize (MAX_SIZE_CTX); @@ -36,7 +36,7 @@ CopyCommandHeader_sys_setup (void **state) * the command buffer in the memory pointed to by tpmInitBuffPtr. This * must point to the data after the context structure. */ - sys_ctx->cmdBuffer = (UINT8*) (sys_ctx + sizeof (_TSS2_SYS_CONTEXT_BLOB)); + sys_ctx->cmdBuffer = (UINT8*) (sys_ctx + sizeof (TSS2_SYS_CONTEXT_BLOB)); InitSysContextFields (sys_ctx); InitSysContextPtrs (sys_ctx, size_ctx); @@ -64,7 +64,7 @@ CopyCommandHeader_sys_teardown (void **state) static void CopyCommandHeader_nextData_unit (void **state) { - _TSS2_SYS_CONTEXT_BLOB *sys_ctx = (_TSS2_SYS_CONTEXT_BLOB *)*state; + TSS2_SYS_CONTEXT_BLOB *sys_ctx = (TSS2_SYS_CONTEXT_BLOB *)*state; TPM2_CC cc = TPM2_CC_GetCapability; CopyCommandHeader (sys_ctx, cc); @@ -79,7 +79,7 @@ CopyCommandHeader_nextData_unit (void **state) static void CopyCommandHeader_tag_unit (void **state) { - _TSS2_SYS_CONTEXT_BLOB *sys_ctx = (_TSS2_SYS_CONTEXT_BLOB*)*state; + TSS2_SYS_CONTEXT_BLOB *sys_ctx = (TSS2_SYS_CONTEXT_BLOB*)*state; TPM2_CC cc = TPM2_CC_GetCapability; TPM20_Header_In *header = (TPM20_Header_In*)sys_ctx->cmdBuffer; /* The TSS code uses a custom function to convert stuff to network byte @@ -99,7 +99,7 @@ CopyCommandHeader_tag_unit (void **state) static void CopyCommandHeader_commandcode_unit (void **state) { - _TSS2_SYS_CONTEXT_BLOB *sys_ctx = (_TSS2_SYS_CONTEXT_BLOB*)*state; + TSS2_SYS_CONTEXT_BLOB *sys_ctx = (TSS2_SYS_CONTEXT_BLOB*)*state; TPM2_CC cc = TPM2_CC_GetCapability; TPM2_CC cc_net = htonl (cc); TPM20_Header_In *header = (TPM20_Header_In*)sys_ctx->cmdBuffer; diff --git a/test/unit/esys-crypto.c b/test/unit/esys-crypto.c index 05b4b548b..fdc8f5c2f 100644 --- a/test/unit/esys-crypto.c +++ b/test/unit/esys-crypto.c @@ -349,7 +349,7 @@ check_get_sys_context(void **state) } #define CHECK_BACKEND_FN(backend, fn) \ - assert_int_equal(backend.fn, _iesys_crypto_##fn) + assert_int_equal(backend.fn, iesys_crypto_##fn##_internal) static TSS2_RC crypto_init(void *userdata) diff --git a/test/unit/esys-sequence-finish.c b/test/unit/esys-sequence-finish.c index 3acd94d0b..1edc40eeb 100644 --- a/test/unit/esys-sequence-finish.c +++ b/test/unit/esys-sequence-finish.c @@ -100,9 +100,9 @@ check_Startup(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -116,9 +116,9 @@ check_Shutdown(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -132,9 +132,9 @@ check_SelfTest(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -148,9 +148,9 @@ check_IncrementalSelfTest(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPML_ALG *toDoList; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -165,9 +165,9 @@ check_GetTestResult(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_MAX_BUFFER *outData; TPM2_RC testResult; @@ -183,9 +183,9 @@ check_StartAuthSession(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; ESYS_TR sessionHandle_handle; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -201,9 +201,9 @@ check_PolicyRestart(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -217,9 +217,9 @@ check_Create(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_PRIVATE *outPrivate; TPM2B_PUBLIC *outPublic; @@ -241,9 +241,9 @@ check_Load(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; ESYS_TR objectHandle_handle; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -258,9 +258,9 @@ check_LoadExternal(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; ESYS_TR objectHandle_handle; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -275,9 +275,9 @@ check_ReadPublic(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_PUBLIC *outPublic; TPM2B_NAME *name; @@ -295,9 +295,9 @@ check_ActivateCredential(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_DIGEST *certInfo; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -312,9 +312,9 @@ check_MakeCredential(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_ID_OBJECT *credentialBlob; TPM2B_ENCRYPTED_SECRET *secret; @@ -330,9 +330,9 @@ check_Unseal(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_SENSITIVE_DATA *outData; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -347,9 +347,9 @@ check_ObjectChangeAuth(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_PRIVATE *outPrivate; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -364,9 +364,9 @@ check_CreateLoaded(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; ESYS_TR objectHandle_handle; TPM2B_PRIVATE *outPrivate; @@ -385,9 +385,9 @@ check_Duplicate(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_DATA *encryptionKeyOut; TPM2B_PRIVATE *duplicate; @@ -405,9 +405,9 @@ check_Rewrap(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_PRIVATE *outDuplicate; TPM2B_ENCRYPTED_SECRET *outSymSeed; @@ -423,9 +423,9 @@ check_Import(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_PRIVATE *outPrivate; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -440,9 +440,9 @@ check_RSA_Encrypt(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_PUBLIC_KEY_RSA *outData; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -457,9 +457,9 @@ check_RSA_Decrypt(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_PUBLIC_KEY_RSA *message; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -474,9 +474,9 @@ check_ECDH_KeyGen(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_ECC_POINT *zPoint; TPM2B_ECC_POINT *pubPoint; @@ -492,9 +492,9 @@ check_ECDH_ZGen(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_ECC_POINT *outPoint; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -509,9 +509,9 @@ check_ECC_Parameters(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPMS_ALGORITHM_DETAIL_ECC *parameters; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -526,9 +526,9 @@ check_ZGen_2Phase(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_ECC_POINT *outZ1; TPM2B_ECC_POINT *outZ2; @@ -544,9 +544,9 @@ check_EncryptDecrypt(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_MAX_BUFFER *outData; TPM2B_IV *ivOut; @@ -562,9 +562,9 @@ check_EncryptDecrypt2(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_MAX_BUFFER *outData; TPM2B_IV *ivOut; @@ -580,9 +580,9 @@ check_Hash(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_DIGEST *outHash; TPMT_TK_HASHCHECK *validation; @@ -598,9 +598,9 @@ check_HMAC(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_DIGEST *outHMAC; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -615,9 +615,9 @@ check_MAC(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_DIGEST *outMAC; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -632,9 +632,9 @@ check_GetRandom(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_DIGEST *randomBytes; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -649,9 +649,9 @@ check_StirRandom(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -665,9 +665,9 @@ check_HMAC_Start(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; ESYS_TR sequenceHandle_handle; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -682,9 +682,9 @@ check_MAC_Start(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; ESYS_TR sequenceHandle_handle; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -699,9 +699,9 @@ check_HashSequenceStart(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; ESYS_TR sequenceHandle_handle; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -716,9 +716,9 @@ check_SequenceUpdate(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -732,9 +732,9 @@ check_SequenceComplete(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_DIGEST *result; TPMT_TK_HASHCHECK *validation; @@ -750,9 +750,9 @@ check_EventSequenceComplete(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPML_DIGEST_VALUES *results; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -767,9 +767,9 @@ check_Certify(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_ATTEST *certifyInfo; TPMT_SIGNATURE *signature; @@ -785,9 +785,9 @@ check_CertifyCreation(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_ATTEST *certifyInfo; TPMT_SIGNATURE *signature; @@ -803,9 +803,9 @@ check_Quote(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_ATTEST *quoted; TPMT_SIGNATURE *signature; @@ -821,9 +821,9 @@ check_GetSessionAuditDigest(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_ATTEST *auditInfo; TPMT_SIGNATURE *signature; @@ -840,9 +840,9 @@ check_GetCommandAuditDigest(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_ATTEST *auditInfo; TPMT_SIGNATURE *signature; @@ -859,9 +859,9 @@ check_GetTime(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_ATTEST *timeInfo; TPMT_SIGNATURE *signature; @@ -877,9 +877,9 @@ check_Commit(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_ECC_POINT *K; TPM2B_ECC_POINT *L; @@ -897,9 +897,9 @@ check_EC_Ephemeral(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_ECC_POINT *Q; UINT16 counter; @@ -915,9 +915,9 @@ check_VerifySignature(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPMT_TK_VERIFIED *validation; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -932,9 +932,9 @@ check_Sign(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPMT_SIGNATURE *signature; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -949,9 +949,9 @@ check_SetCommandCodeAuditStatus(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -965,9 +965,9 @@ check_PCR_Extend(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -981,9 +981,9 @@ check_PCR_Event(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPML_DIGEST_VALUES *digests; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -998,9 +998,9 @@ check_PCR_Read(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPML_PCR_SELECTION *pcrSelectionOut; TPML_DIGEST *pcrValues; @@ -1019,9 +1019,9 @@ check_PCR_Allocate(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPMI_YES_NO allocationSuccess; UINT32 maxPCR; @@ -1041,9 +1041,9 @@ check_PCR_SetAuthPolicy(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1057,9 +1057,9 @@ check_PCR_SetAuthValue(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1073,9 +1073,9 @@ check_PCR_Reset(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1089,9 +1089,9 @@ check_PolicySigned(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_TIMEOUT *timeout; TPMT_TK_AUTH *policyTicket; @@ -1107,9 +1107,9 @@ check_PolicySecret(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_TIMEOUT *timeout; TPMT_TK_AUTH *policyTicket; @@ -1125,9 +1125,9 @@ check_PolicyTicket(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1141,9 +1141,9 @@ check_PolicyOR(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1157,9 +1157,9 @@ check_PolicyPCR(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1173,9 +1173,9 @@ check_PolicyLocality(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1189,9 +1189,9 @@ check_PolicyNV(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1205,9 +1205,9 @@ check_PolicyCounterTimer(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1221,9 +1221,9 @@ check_PolicyCommandCode(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1237,9 +1237,9 @@ check_PolicyPhysicalPresence(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1253,9 +1253,9 @@ check_PolicyCpHash(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1269,9 +1269,9 @@ check_PolicyNameHash(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1285,9 +1285,9 @@ check_PolicyDuplicationSelect(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1301,9 +1301,9 @@ check_PolicyAuthorize(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1317,9 +1317,9 @@ check_PolicyAuthValue(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1333,9 +1333,9 @@ check_PolicyPassword(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1349,9 +1349,9 @@ check_PolicyGetDigest(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_DIGEST *policyDigest; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -1366,9 +1366,9 @@ check_PolicyNvWritten(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1382,9 +1382,9 @@ check_PolicyTemplate(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1398,9 +1398,9 @@ check_PolicyAuthorizeNV(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1414,9 +1414,9 @@ check_CreatePrimary(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; ESYS_TR objectHandle_handle; TPM2B_PUBLIC *outPublic; @@ -1439,9 +1439,9 @@ check_HierarchyControl(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1455,9 +1455,9 @@ check_SetPrimaryPolicy(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1471,9 +1471,9 @@ check_ChangePPS(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1487,9 +1487,9 @@ check_ChangeEPS(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1503,9 +1503,9 @@ check_Clear(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1519,9 +1519,9 @@ check_ClearControl(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1535,9 +1535,9 @@ check_HierarchyChangeAuth(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1551,9 +1551,9 @@ check_DictionaryAttackLockReset(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1567,9 +1567,9 @@ check_DictionaryAttackParameters(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1583,9 +1583,9 @@ check_PP_Commands(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1599,9 +1599,9 @@ check_SetAlgorithmSet(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1615,9 +1615,9 @@ check_FieldUpgradeStart(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1631,9 +1631,9 @@ check_FieldUpgradeData(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPMT_HA *nextDigest; TPMT_HA *firstDigest; @@ -1650,9 +1650,9 @@ check_FirmwareRead(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_MAX_BUFFER *fuData; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -1667,9 +1667,9 @@ check_ContextSave(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPMS_CONTEXT *context; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -1684,9 +1684,9 @@ check_ContextLoad(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; ESYS_TR loadedHandle_handle; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -1701,9 +1701,9 @@ check_FlushContext(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1717,9 +1717,9 @@ check_EvictControl(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; ESYS_TR newObjectHandle_handle; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -1734,9 +1734,9 @@ check_ReadClock(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPMS_TIME_INFO *currentTime; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -1751,9 +1751,9 @@ check_ClockSet(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1767,9 +1767,9 @@ check_ClockRateAdjust(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1783,9 +1783,9 @@ check_GetCapability(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPMS_CAPABILITY_DATA *capabilityData; TPMI_YES_NO moreData; @@ -1801,9 +1801,9 @@ check_TestParms(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1817,9 +1817,9 @@ check_NV_DefineSpace(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; ESYS_TR nvHandle_handle; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -1834,9 +1834,9 @@ check_NV_UndefineSpace(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1850,9 +1850,9 @@ check_NV_UndefineSpaceSpecial(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1866,9 +1866,9 @@ check_NV_ReadPublic(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_NV_PUBLIC *nvPublic; TPM2B_NAME *nvName; @@ -1884,9 +1884,9 @@ check_NV_Write(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1900,9 +1900,9 @@ check_NV_Increment(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1916,9 +1916,9 @@ check_NV_Extend(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1932,9 +1932,9 @@ check_NV_SetBits(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1948,9 +1948,9 @@ check_NV_WriteLock(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1964,9 +1964,9 @@ check_NV_GlobalWriteLock(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -1980,9 +1980,9 @@ check_NV_Read(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_MAX_NV_BUFFER *data; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -1997,9 +1997,9 @@ check_NV_ReadLock(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -2013,9 +2013,9 @@ check_NV_ChangeAuth(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; @@ -2029,9 +2029,9 @@ check_NV_Certify(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_ATTEST *certifyInfo; TPMT_SIGNATURE *signature; @@ -2047,9 +2047,9 @@ check_Vendor_TCG_Test(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPM2B_DATA *outputData; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -2064,9 +2064,9 @@ check_AC_GetCapability(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPML_AC_CAPABILITIES *capabilityData; TPMI_YES_NO moreData; @@ -2082,9 +2082,9 @@ check_AC_Send(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; TPMS_AC_OUTPUT *acDataOut; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { @@ -2099,9 +2099,9 @@ check_Policy_AC_SendSelect(void **state) { TSS2_RC r; ESYS_CONTEXT *esys_context = (ESYS_CONTEXT *) * state; - enum _ESYS_STATE esys_states[3] = { - _ESYS_STATE_INIT, - _ESYS_STATE_INTERNALERROR + enum ESYS_STATE esys_states[3] = { + ESYS_STATE_INIT, + ESYS_STATE_INTERNALERROR }; for (size_t i = 0; i < sizeof(esys_states) / sizeof(esys_states[0]); i++) { esys_context->state = esys_states[i]; diff --git a/tss2-dlopen/tss2-dlopen-esys.c b/tss2-dlopen/tss2-dlopen-esys.c index a1a01f7ce..3c261ed42 100644 --- a/tss2-dlopen/tss2-dlopen-esys.c +++ b/tss2-dlopen/tss2-dlopen-esys.c @@ -87,18 +87,18 @@ Esys_Finalize(ESYS_CONTEXT **ctx) } void -Esys_Free(void *__ptr) +Esys_Free(void *ptr) { - if (!__ptr) + if (!ptr) return; - static TSS2_RC (*sym) (void *__ptr) = NULL; + static TSS2_RC (*sym) (void *ptr) = NULL; if (!sym) sym = dlsym(dlhandle, "Esys_Free"); if (!sym) { WARN("Function Esys_Free not found."); return; } - sym(__ptr); + sym(ptr); } #define MAKE_ESYS_0(fun) \ diff --git a/tss2-dlopen/tss2-dlopen-fapi.c b/tss2-dlopen/tss2-dlopen-fapi.c index 92fb586d9..4d96fbd56 100644 --- a/tss2-dlopen/tss2-dlopen-fapi.c +++ b/tss2-dlopen/tss2-dlopen-fapi.c @@ -117,18 +117,18 @@ Fapi_Finalize(FAPI_CONTEXT **ctx) } void -Fapi_Free(void *__ptr) +Fapi_Free(void *ptr) { - if (!__ptr) + if (!ptr) return; - static TSS2_RC (*sym) (void *__ptr) = NULL; + static TSS2_RC (*sym) (void *ptr) = NULL; if (!sym) sym = dlsym(dlhandle, "Fapi_Free"); if (!sym) { WARN("Function Fapi_Free not found."); return; } - sym(__ptr); + sym(ptr); } #define MAKE_FAPI_0(fun) \