diff options
Diffstat (limited to 'src/tss2-esys/api/Esys_NV_ReadPublic.c')
| -rw-r--r-- | src/tss2-esys/api/Esys_NV_ReadPublic.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/tss2-esys/api/Esys_NV_ReadPublic.c b/src/tss2-esys/api/Esys_NV_ReadPublic.c index 2d271c98..c7d61c88 100644 --- a/src/tss2-esys/api/Esys_NV_ReadPublic.c +++ b/src/tss2-esys/api/Esys_NV_ReadPublic.c @@ -20,7 +20,7 @@ static void store_input_parameters ( ESYS_CONTEXT *esysContext, ESYS_TR nvIndex) { - esysContext->in.NV_ReadPublic.nvIndex = nvIndex; + esysContext->in.NV.nvIndex = nvIndex; } /** One-Call function for TPM2_NV_ReadPublic @@ -162,7 +162,7 @@ Esys_NV_ReadPublic_Async( return r; esysContext->state = _ESYS_STATE_INTERNALERROR; - /* Check and store input parameters */ + /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 0); return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); store_input_parameters(esysContext, nvIndex); @@ -254,7 +254,8 @@ Esys_NV_ReadPublic_Finish( } /* Check for correct sequence and set sequence to irregular for now */ - if (esysContext->state != _ESYS_STATE_SENT) { + if (esysContext->state != _ESYS_STATE_SENT && + esysContext->state != _ESYS_STATE_RESUBMISSION) { LOG_ERROR("Esys called in bad sequence."); return TSS2_ESYS_RC_BAD_SEQUENCE; } @@ -282,17 +283,13 @@ 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; goto error_cleanup; } esysContext->state = _ESYS_STATE_RESUBMISSION; - r = Esys_NV_ReadPublic_Async(esysContext, - esysContext->in.NV_ReadPublic.nvIndex, - esysContext->session_type[0], - esysContext->session_type[1], - esysContext->session_type[2]); + r = Tss2_Sys_ExecuteAsync(esysContext->sys); if (r != TSS2_RC_SUCCESS) { LOG_WARNING("Error attempting to resubmit"); /* We do not set esysContext->state here but inherit the most recent @@ -333,7 +330,7 @@ Esys_NV_ReadPublic_Finish( /* Update the meta data of the ESYS_TR object */ - ESYS_TR nvIndex = esysContext->in.NV_ReadPublic.nvIndex; + ESYS_TR nvIndex = esysContext->in.NV.nvIndex; RSRC_NODE_T *nvIndexNode; r = esys_GetResourceObject(esysContext, nvIndex, &nvIndexNode); goto_if_error(r, "get resource", error_cleanup); |