diff options
Diffstat (limited to 'src/tss2-esys/api/Esys_PCR_Extend.c')
-rw-r--r-- | src/tss2-esys/api/Esys_PCR_Extend.c | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/src/tss2-esys/api/Esys_PCR_Extend.c b/src/tss2-esys/api/Esys_PCR_Extend.c index 5d57023c..ee5b62b4 100644 --- a/src/tss2-esys/api/Esys_PCR_Extend.c +++ b/src/tss2-esys/api/Esys_PCR_Extend.c @@ -15,22 +15,6 @@ #include "util/log.h" #include "util/aux_util.h" -/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */ -static void store_input_parameters ( - ESYS_CONTEXT *esysContext, - ESYS_TR pcrHandle, - const TPML_DIGEST_VALUES *digests) -{ - esysContext->in.PCR_Extend.pcrHandle = pcrHandle; - if (digests == NULL) { - esysContext->in.PCR_Extend.digests = NULL; - } else { - esysContext->in.PCR_Extend.digestsData = *digests; - esysContext->in.PCR_Extend.digests = - &esysContext->in.PCR_Extend.digestsData; - } -} - /** One-Call function for TPM2_PCR_Extend * * This function invokes the TPM2_PCR_Extend command in a one-call @@ -174,10 +158,9 @@ Esys_PCR_Extend_Async( return r; esysContext->state = _ESYS_STATE_INTERNALERROR; - /* Check and store input parameters */ + /* Check input parameters */ r = check_session_feasibility(shandle1, shandle2, shandle3, 1); return_state_if_error(r, _ESYS_STATE_INIT, "Check session usage"); - store_input_parameters(esysContext, pcrHandle, digests); /* Retrieve the metadata objects for provided handles */ r = esys_GetResourceObject(esysContext, pcrHandle, &pcrHandleNode); @@ -259,7 +242,8 @@ Esys_PCR_Extend_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; } @@ -277,18 +261,13 @@ 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; return r; } esysContext->state = _ESYS_STATE_RESUBMISSION; - r = Esys_PCR_Extend_Async(esysContext, - esysContext->in.PCR_Extend.pcrHandle, - esysContext->session_type[0], - esysContext->session_type[1], - esysContext->session_type[2], - esysContext->in.PCR_Extend.digests); + 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 |