ESAPI: Update logging
Add / move trace logging in ESAPI TPM commands.
Also use level TRACE instead of DEBUG.
Signed-off-by: Andreas Fuchs <andreas.fuchs@sit.fraunhofer.de>
diff --git a/src/tss2-esys/api/Esys_ActivateCredential.c b/src/tss2-esys/api/Esys_ActivateCredential.c
index 018dab3..e79eb4f 100644
--- a/src/tss2-esys/api/Esys_ActivateCredential.c
+++ b/src/tss2-esys/api/Esys_ActivateCredential.c
@@ -168,6 +168,9 @@
const TPM2B_ENCRYPTED_SECRET *secret)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, activateHandle=%"PRIx32 ", keyHandle=%"PRIx32 ","
+ "credentialBlob=%p, secret=%p",
+ esysContext, activateHandle, keyHandle, credentialBlob, secret);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *activateHandleNode;
RSRC_NODE_T *keyHandleNode;
@@ -247,8 +250,10 @@
ESYS_CONTEXT *esysContext,
TPM2B_DIGEST **certInfo)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, certInfo=%p",
+ esysContext, certInfo);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -332,8 +337,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, certInfo=%p",
- esysContext, certInfo);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_Certify.c b/src/tss2-esys/api/Esys_Certify.c
index fd3f2ff..57cc68e 100644
--- a/src/tss2-esys/api/Esys_Certify.c
+++ b/src/tss2-esys/api/Esys_Certify.c
@@ -172,6 +172,9 @@
const TPMT_SIG_SCHEME *inScheme)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, objectHandle=%"PRIx32 ", signHandle=%"PRIx32 ","
+ "qualifyingData=%p, inScheme=%p",
+ esysContext, objectHandle, signHandle, qualifyingData, inScheme);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *objectHandleNode;
RSRC_NODE_T *signHandleNode;
@@ -254,8 +257,10 @@
TPM2B_ATTEST **certifyInfo,
TPMT_SIGNATURE **signature)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, certifyInfo=%p, signature=%p",
+ esysContext, certifyInfo, signature);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -346,8 +351,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, certifyInfo=%p, signature=%p",
- esysContext, certifyInfo, signature);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_CertifyCreation.c b/src/tss2-esys/api/Esys_CertifyCreation.c
index f8982b8..ccafe1b 100644
--- a/src/tss2-esys/api/Esys_CertifyCreation.c
+++ b/src/tss2-esys/api/Esys_CertifyCreation.c
@@ -198,6 +198,11 @@
const TPMT_TK_CREATION *creationTicket)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, signHandle=%"PRIx32 ", objectHandle=%"PRIx32 ","
+ "qualifyingData=%p, creationHash=%p, inScheme=%p,"
+ "creationTicket=%p",
+ esysContext, signHandle, objectHandle, qualifyingData, creationHash,
+ inScheme, creationTicket);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *signHandleNode;
RSRC_NODE_T *objectHandleNode;
@@ -283,8 +288,10 @@
TPM2B_ATTEST **certifyInfo,
TPMT_SIGNATURE **signature)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, certifyInfo=%p, signature=%p",
+ esysContext, certifyInfo, signature);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -377,8 +384,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, certifyInfo=%p, signature=%p",
- esysContext, certifyInfo, signature);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_ChangeEPS.c b/src/tss2-esys/api/Esys_ChangeEPS.c
index 20a943e..be73d2c 100644
--- a/src/tss2-esys/api/Esys_ChangeEPS.c
+++ b/src/tss2-esys/api/Esys_ChangeEPS.c
@@ -129,6 +129,8 @@
ESYS_TR shandle3)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, authHandle=%"PRIx32 "",
+ esysContext, authHandle);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authHandleNode;
@@ -196,8 +198,10 @@
Esys_ChangeEPS_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -268,8 +272,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_ChangePPS.c b/src/tss2-esys/api/Esys_ChangePPS.c
index 207e316..8179f4c 100644
--- a/src/tss2-esys/api/Esys_ChangePPS.c
+++ b/src/tss2-esys/api/Esys_ChangePPS.c
@@ -129,6 +129,8 @@
ESYS_TR shandle3)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, authHandle=%"PRIx32 "",
+ esysContext, authHandle);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authHandleNode;
@@ -196,8 +198,10 @@
Esys_ChangePPS_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -268,8 +272,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_Clear.c b/src/tss2-esys/api/Esys_Clear.c
index af97e22..a494e0e 100644
--- a/src/tss2-esys/api/Esys_Clear.c
+++ b/src/tss2-esys/api/Esys_Clear.c
@@ -129,6 +129,8 @@
ESYS_TR shandle3)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, authHandle=%"PRIx32 "",
+ esysContext, authHandle);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authHandleNode;
@@ -196,8 +198,10 @@
Esys_Clear_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -268,8 +272,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_ClearControl.c b/src/tss2-esys/api/Esys_ClearControl.c
index ff664e4..0ac17ce 100644
--- a/src/tss2-esys/api/Esys_ClearControl.c
+++ b/src/tss2-esys/api/Esys_ClearControl.c
@@ -136,6 +136,8 @@
TPMI_YES_NO disable)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, auth=%"PRIx32 ", disable=%02"PRIx8"",
+ esysContext, auth, disable);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authNode;
@@ -205,8 +207,10 @@
Esys_ClearControl_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -278,8 +282,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_ClockRateAdjust.c b/src/tss2-esys/api/Esys_ClockRateAdjust.c
index 59bdead..6d53667 100644
--- a/src/tss2-esys/api/Esys_ClockRateAdjust.c
+++ b/src/tss2-esys/api/Esys_ClockRateAdjust.c
@@ -136,6 +136,8 @@
TPM2_CLOCK_ADJUST rateAdjust)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, auth=%"PRIx32 ", rateAdjust=%"PRIi8"",
+ esysContext, auth, rateAdjust);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authNode;
@@ -205,8 +207,10 @@
Esys_ClockRateAdjust_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -278,8 +282,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_ClockSet.c b/src/tss2-esys/api/Esys_ClockSet.c
index 5ff53f1..d9b78d9 100644
--- a/src/tss2-esys/api/Esys_ClockSet.c
+++ b/src/tss2-esys/api/Esys_ClockSet.c
@@ -136,6 +136,8 @@
UINT64 newTime)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, auth=%"PRIx32 ", newTime=%"PRIx64"",
+ esysContext, auth, newTime);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authNode;
@@ -205,8 +207,10 @@
Esys_ClockSet_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -278,8 +282,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_Commit.c b/src/tss2-esys/api/Esys_Commit.c
index c3c39ad..26dc624 100644
--- a/src/tss2-esys/api/Esys_Commit.c
+++ b/src/tss2-esys/api/Esys_Commit.c
@@ -184,6 +184,9 @@
const TPM2B_ECC_PARAMETER *y2)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, signHandle=%"PRIx32 ", P1=%p,"
+ "s2=%p, y2=%p",
+ esysContext, signHandle, P1, s2, y2);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *signHandleNode;
@@ -269,8 +272,12 @@
TPM2B_ECC_POINT **E,
UINT16 *counter)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, K=%p, L=%p,"
+ "E=%p, counter=%p",
+ esysContext, K, L,
+ E, counter);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -369,10 +376,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, K=%p, L=%p,"
- "E=%p, counter=%p",
- esysContext, K, L,
- E, counter);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_ContextLoad.c b/src/tss2-esys/api/Esys_ContextLoad.c
index aaa6190..196411b 100644
--- a/src/tss2-esys/api/Esys_ContextLoad.c
+++ b/src/tss2-esys/api/Esys_ContextLoad.c
@@ -121,6 +121,8 @@
const TPMS_CONTEXT *context)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, context=%p",
+ esysContext, context);
IESYS_CONTEXT_DATA esyscontextData = {0};
TPMS_CONTEXT tpmContext;
@@ -195,8 +197,10 @@
ESYS_CONTEXT *esysContext,
ESYS_TR *loadedHandle)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, loadedHandle=%p",
+ esysContext, loadedHandle);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -275,8 +279,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, loadedHandle=%p",
- esysContext, loadedHandle);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_ContextSave.c b/src/tss2-esys/api/Esys_ContextSave.c
index 43ff380..bc0da91 100644
--- a/src/tss2-esys/api/Esys_ContextSave.c
+++ b/src/tss2-esys/api/Esys_ContextSave.c
@@ -118,6 +118,8 @@
ESYS_TR saveHandle)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, saveHandle=%"PRIx32 "",
+ esysContext, saveHandle);
RSRC_NODE_T *saveHandleNode;
/* Check context, sequence correctness and set state to error for now */
@@ -168,8 +170,10 @@
TPMS_CONTEXT **context)
{
TPMS_CONTEXT *lcontext = NULL;
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, context=%p",
+ esysContext, context);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -268,8 +272,6 @@
SAFE_FREE(lcontext);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, context=%p",
- esysContext, context);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_Create.c b/src/tss2-esys/api/Esys_Create.c
index a1a9a6a..19e5a62 100644
--- a/src/tss2-esys/api/Esys_Create.c
+++ b/src/tss2-esys/api/Esys_Create.c
@@ -201,6 +201,10 @@
const TPML_PCR_SELECTION *creationPCR)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, parentHandle=%"PRIx32 ", inSensitive=%p,"
+ "inPublic=%p, outsideInfo=%p, creationPCR=%p",
+ esysContext, parentHandle, inSensitive, inPublic, outsideInfo,
+ creationPCR);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *parentHandleNode;
@@ -291,8 +295,12 @@
TPM2B_DIGEST **creationHash,
TPMT_TK_CREATION **creationTicket)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, outPrivate=%p, outPublic=%p,"
+ "creationData=%p, creationHash=%p, creationTicket=%p",
+ esysContext, outPrivate, outPublic,
+ creationData, creationHash, creationTicket);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -405,10 +413,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, outPrivate=%p, outPublic=%p,"
- "creationData=%p, creationHash=%p, creationTicket=%p",
- esysContext, outPrivate, outPublic,
- creationData, creationHash, creationTicket);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_CreateLoaded.c b/src/tss2-esys/api/Esys_CreateLoaded.c
index 3cf95d0..878db7c 100644
--- a/src/tss2-esys/api/Esys_CreateLoaded.c
+++ b/src/tss2-esys/api/Esys_CreateLoaded.c
@@ -166,6 +166,9 @@
const TPM2B_TEMPLATE *inPublic)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, parentHandle=%"PRIx32 ", inSensitive=%p,"
+ "inPublic=%p",
+ esysContext, parentHandle, inSensitive, inPublic);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *parentHandleNode;
@@ -246,8 +249,12 @@
TPM2B_PUBLIC **outPublic)
{
TPM2B_PUBLIC *loutPublic = NULL;
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, objectHandle=%p, outPrivate=%p,"
+ "outPublic=%p",
+ esysContext, objectHandle, outPrivate,
+ outPublic);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -371,10 +378,6 @@
SAFE_FREE(loutPublic);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, objectHandle=%p, outPrivate=%p,"
- "outPublic=%p",
- esysContext, objectHandle, outPrivate,
- outPublic);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_CreatePrimary.c b/src/tss2-esys/api/Esys_CreatePrimary.c
index 1f2b779..ea3e721 100644
--- a/src/tss2-esys/api/Esys_CreatePrimary.c
+++ b/src/tss2-esys/api/Esys_CreatePrimary.c
@@ -200,6 +200,10 @@
const TPML_PCR_SELECTION *creationPCR)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, primaryHandle=%"PRIx32 ", inSensitive=%p,"
+ "inPublic=%p, outsideInfo=%p, creationPCR=%p",
+ esysContext, primaryHandle, inSensitive, inPublic, outsideInfo,
+ creationPCR);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *primaryHandleNode;
@@ -290,8 +294,12 @@
TPMT_TK_CREATION **creationTicket)
{
TPM2B_PUBLIC *loutPublic = NULL;
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, objectHandle=%p, outPublic=%p,"
+ "creationData=%p, creationHash=%p, creationTicket=%p",
+ esysContext, objectHandle, outPublic,
+ creationData, creationHash, creationTicket);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -424,10 +432,6 @@
SAFE_FREE(loutPublic);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, objectHandle=%p, outPublic=%p,"
- "creationData=%p, creationHash=%p, creationTicket=%p",
- esysContext, objectHandle, outPublic,
- creationData, creationHash, creationTicket);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_DictionaryAttackLockReset.c b/src/tss2-esys/api/Esys_DictionaryAttackLockReset.c
index da78ecf..6160b09 100644
--- a/src/tss2-esys/api/Esys_DictionaryAttackLockReset.c
+++ b/src/tss2-esys/api/Esys_DictionaryAttackLockReset.c
@@ -129,6 +129,8 @@
ESYS_TR shandle3)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, lockHandle=%"PRIx32 "",
+ esysContext, lockHandle);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *lockHandleNode;
@@ -196,8 +198,10 @@
Esys_DictionaryAttackLockReset_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -268,8 +272,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_DictionaryAttackParameters.c b/src/tss2-esys/api/Esys_DictionaryAttackParameters.c
index 2ef530e..cf32f1c 100644
--- a/src/tss2-esys/api/Esys_DictionaryAttackParameters.c
+++ b/src/tss2-esys/api/Esys_DictionaryAttackParameters.c
@@ -150,6 +150,9 @@
UINT32 lockoutRecovery)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, lockHandle=%"PRIx32 ", newMaxTries=%"PRIx32 ","
+ "newRecoveryTime=%"PRIx32 ", lockoutRecovery=%"PRIx32 "",
+ esysContext, lockHandle, newMaxTries, newRecoveryTime, lockoutRecovery);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *lockHandleNode;
@@ -223,8 +226,10 @@
Esys_DictionaryAttackParameters_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -298,8 +303,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_Duplicate.c b/src/tss2-esys/api/Esys_Duplicate.c
index 8de40e8..10c22b3 100644
--- a/src/tss2-esys/api/Esys_Duplicate.c
+++ b/src/tss2-esys/api/Esys_Duplicate.c
@@ -176,6 +176,9 @@
const TPMT_SYM_DEF_OBJECT *symmetricAlg)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, objectHandle=%"PRIx32 ", newParentHandle=%"PRIx32 ","
+ "encryptionKeyIn=%p, symmetricAlg=%p",
+ esysContext, objectHandle, newParentHandle, encryptionKeyIn, symmetricAlg);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *objectHandleNode;
RSRC_NODE_T *newParentHandleNode;
@@ -260,8 +263,12 @@
TPM2B_PRIVATE **duplicate,
TPM2B_ENCRYPTED_SECRET **outSymSeed)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, encryptionKeyOut=%p, duplicate=%p,"
+ "outSymSeed=%p",
+ esysContext, encryptionKeyOut, duplicate,
+ outSymSeed);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -359,10 +366,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, encryptionKeyOut=%p, duplicate=%p,"
- "outSymSeed=%p",
- esysContext, encryptionKeyOut, duplicate,
- outSymSeed);
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 e69b69a..717b69f 100644
--- a/src/tss2-esys/api/Esys_ECC_Parameters.c
+++ b/src/tss2-esys/api/Esys_ECC_Parameters.c
@@ -131,6 +131,8 @@
TPMI_ECC_CURVE curveID)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, curveID=%04"PRIx16"",
+ esysContext, curveID);
TSS2L_SYS_AUTH_COMMAND auths;
/* Check context, sequence correctness and set state to error for now */
@@ -196,8 +198,10 @@
ESYS_CONTEXT *esysContext,
TPMS_ALGORITHM_DETAIL_ECC **parameters)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, parameters=%p",
+ esysContext, parameters);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -278,8 +282,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, parameters=%p",
- esysContext, parameters);
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 692c264..ec9afbd 100644
--- a/src/tss2-esys/api/Esys_ECDH_KeyGen.c
+++ b/src/tss2-esys/api/Esys_ECDH_KeyGen.c
@@ -137,6 +137,8 @@
ESYS_TR shandle3)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, keyHandle=%"PRIx32 "",
+ esysContext, keyHandle);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *keyHandleNode;
@@ -209,8 +211,10 @@
TPM2B_ECC_POINT **zPoint,
TPM2B_ECC_POINT **pubPoint)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, zPoint=%p, pubPoint=%p",
+ esysContext, zPoint, pubPoint);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -298,8 +302,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, zPoint=%p, pubPoint=%p",
- esysContext, zPoint, pubPoint);
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 4076df0..1fd409c 100644
--- a/src/tss2-esys/api/Esys_ECDH_ZGen.c
+++ b/src/tss2-esys/api/Esys_ECDH_ZGen.c
@@ -146,6 +146,8 @@
const TPM2B_ECC_POINT *inPoint)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, keyHandle=%"PRIx32 ", inPoint=%p",
+ esysContext, keyHandle, inPoint);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *keyHandleNode;
@@ -218,8 +220,10 @@
ESYS_CONTEXT *esysContext,
TPM2B_ECC_POINT **outPoint)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, outPoint=%p",
+ esysContext, outPoint);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -301,8 +305,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, outPoint=%p",
- esysContext, outPoint);
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 16f9ed8..4e90773 100644
--- a/src/tss2-esys/api/Esys_EC_Ephemeral.c
+++ b/src/tss2-esys/api/Esys_EC_Ephemeral.c
@@ -135,6 +135,8 @@
TPMI_ECC_CURVE curveID)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, curveID=%04"PRIx16"",
+ esysContext, curveID);
TSS2L_SYS_AUTH_COMMAND auths;
/* Check context, sequence correctness and set state to error for now */
@@ -203,8 +205,10 @@
TPM2B_ECC_POINT **Q,
UINT16 *counter)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, Q=%p, counter=%p",
+ esysContext, Q, counter);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -286,8 +290,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, Q=%p, counter=%p",
- esysContext, Q, counter);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_EncryptDecrypt.c b/src/tss2-esys/api/Esys_EncryptDecrypt.c
index 3574438..936965f 100644
--- a/src/tss2-esys/api/Esys_EncryptDecrypt.c
+++ b/src/tss2-esys/api/Esys_EncryptDecrypt.c
@@ -177,6 +177,10 @@
const TPM2B_MAX_BUFFER *inData)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, keyHandle=%"PRIx32 ", decrypt=%02"PRIx8","
+ "mode=%04"PRIx16", ivIn=%p, inData=%p",
+ esysContext, keyHandle, decrypt, mode, ivIn,
+ inData);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *keyHandleNode;
@@ -258,8 +262,10 @@
TPM2B_MAX_BUFFER **outData,
TPM2B_IV **ivOut)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, outData=%p, ivOut=%p",
+ esysContext, outData, ivOut);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -351,8 +357,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, outData=%p, ivOut=%p",
- esysContext, outData, ivOut);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_EncryptDecrypt2.c b/src/tss2-esys/api/Esys_EncryptDecrypt2.c
index a23e778..81713cb 100644
--- a/src/tss2-esys/api/Esys_EncryptDecrypt2.c
+++ b/src/tss2-esys/api/Esys_EncryptDecrypt2.c
@@ -177,6 +177,10 @@
const TPM2B_IV *ivIn)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, keyHandle=%"PRIx32 ", inData=%p,"
+ "decrypt=%02"PRIx8", mode=%04"PRIx16", ivIn=%p",
+ esysContext, keyHandle, inData, decrypt, mode,
+ ivIn);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *keyHandleNode;
@@ -258,8 +262,10 @@
TPM2B_MAX_BUFFER **outData,
TPM2B_IV **ivOut)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, outData=%p, ivOut=%p",
+ esysContext, outData, ivOut);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -351,8 +357,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, outData=%p, ivOut=%p",
- esysContext, outData, ivOut);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_EventSequenceComplete.c b/src/tss2-esys/api/Esys_EventSequenceComplete.c
index 9d5a9cc..54e499d 100644
--- a/src/tss2-esys/api/Esys_EventSequenceComplete.c
+++ b/src/tss2-esys/api/Esys_EventSequenceComplete.c
@@ -155,6 +155,9 @@
const TPM2B_MAX_BUFFER *buffer)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, pcrHandle=%"PRIx32 ", sequenceHandle=%"PRIx32 ","
+ "buffer=%p",
+ esysContext, pcrHandle, sequenceHandle, buffer);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *pcrHandleNode;
RSRC_NODE_T *sequenceHandleNode;
@@ -232,8 +235,10 @@
ESYS_CONTEXT *esysContext,
TPML_DIGEST_VALUES **results)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, results=%p",
+ esysContext, results);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -316,8 +321,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, results=%p",
- esysContext, results);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_EvictControl.c b/src/tss2-esys/api/Esys_EvictControl.c
index cc00c86..dd6e62a 100644
--- a/src/tss2-esys/api/Esys_EvictControl.c
+++ b/src/tss2-esys/api/Esys_EvictControl.c
@@ -148,6 +148,9 @@
TPMI_DH_PERSISTENT persistentHandle)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, auth=%"PRIx32 ", objectHandle=%"PRIx32 ","
+ "persistentHandle=%"PRIx32 "",
+ esysContext, auth, objectHandle, persistentHandle);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authNode;
RSRC_NODE_T *objectHandleNode;
@@ -228,8 +231,10 @@
ESYS_CONTEXT *esysContext,
ESYS_TR *newObjectHandle)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, newObjectHandle=%p",
+ esysContext, newObjectHandle);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -335,8 +340,6 @@
newObjectHandleNode->rsrc.handle = esysContext->in.EvictControl.persistentHandle;
}
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, newObjectHandle=%p",
- esysContext, newObjectHandle);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_FieldUpgradeData.c b/src/tss2-esys/api/Esys_FieldUpgradeData.c
index e8bf8b9..ad32535 100644
--- a/src/tss2-esys/api/Esys_FieldUpgradeData.c
+++ b/src/tss2-esys/api/Esys_FieldUpgradeData.c
@@ -141,6 +141,8 @@
const TPM2B_MAX_BUFFER *fuData)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, fuData=%p",
+ esysContext, fuData);
TSS2L_SYS_AUTH_COMMAND auths;
/* Check context, sequence correctness and set state to error for now */
@@ -209,8 +211,10 @@
TPMT_HA **nextDigest,
TPMT_HA **firstDigest)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, nextDigest=%p, firstDigest=%p",
+ esysContext, nextDigest, firstDigest);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -298,8 +302,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, nextDigest=%p, firstDigest=%p",
- esysContext, nextDigest, firstDigest);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_FieldUpgradeStart.c b/src/tss2-esys/api/Esys_FieldUpgradeStart.c
index 47fb591..b9f2591 100644
--- a/src/tss2-esys/api/Esys_FieldUpgradeStart.c
+++ b/src/tss2-esys/api/Esys_FieldUpgradeStart.c
@@ -164,6 +164,9 @@
const TPMT_SIGNATURE *manifestSignature)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, authorization=%"PRIx32 ", keyHandle=%"PRIx32 ","
+ "fuDigest=%p, manifestSignature=%p",
+ esysContext, authorization, keyHandle, fuDigest, manifestSignature);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authorizationNode;
RSRC_NODE_T *keyHandleNode;
@@ -239,8 +242,10 @@
Esys_FieldUpgradeStart_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -314,8 +319,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_FirmwareRead.c b/src/tss2-esys/api/Esys_FirmwareRead.c
index 83cfee1..9df90a0 100644
--- a/src/tss2-esys/api/Esys_FirmwareRead.c
+++ b/src/tss2-esys/api/Esys_FirmwareRead.c
@@ -131,6 +131,8 @@
UINT32 sequenceNumber)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, sequenceNumber=%"PRIx32 "",
+ esysContext, sequenceNumber);
TSS2L_SYS_AUTH_COMMAND auths;
/* Check context, sequence correctness and set state to error for now */
@@ -196,8 +198,10 @@
ESYS_CONTEXT *esysContext,
TPM2B_MAX_BUFFER **fuData)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, fuData=%p",
+ esysContext, fuData);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -278,8 +282,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, fuData=%p",
- esysContext, fuData);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_FlushContext.c b/src/tss2-esys/api/Esys_FlushContext.c
index 7224a81..4a36c29 100644
--- a/src/tss2-esys/api/Esys_FlushContext.c
+++ b/src/tss2-esys/api/Esys_FlushContext.c
@@ -114,6 +114,8 @@
ESYS_TR flushHandle)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, flushHandle=%"PRIx32 "",
+ esysContext, flushHandle);
RSRC_NODE_T *flushHandleNode;
/* Check context, sequence correctness and set state to error for now */
@@ -160,8 +162,10 @@
Esys_FlushContext_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -222,8 +226,6 @@
return_if_error(r, "invalidate object");
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_GetCapability.c b/src/tss2-esys/api/Esys_GetCapability.c
index abe0d40..6027a6a 100644
--- a/src/tss2-esys/api/Esys_GetCapability.c
+++ b/src/tss2-esys/api/Esys_GetCapability.c
@@ -149,6 +149,9 @@
UINT32 propertyCount)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, capability=%"PRIx32 ", property=%"PRIx32 ","
+ "propertyCount=%"PRIx32 "",
+ esysContext, capability, property, propertyCount);
TSS2L_SYS_AUTH_COMMAND auths;
/* Check context, sequence correctness and set state to error for now */
@@ -221,8 +224,10 @@
TPMI_YES_NO *moreData,
TPMS_CAPABILITY_DATA **capabilityData)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, moreData=%p, capabilityData=%p",
+ esysContext, moreData, capabilityData);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -306,8 +311,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, moreData=%p, capabilityData=%p",
- esysContext, moreData, capabilityData);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_GetCommandAuditDigest.c b/src/tss2-esys/api/Esys_GetCommandAuditDigest.c
index d468c40..36ee8fa 100644
--- a/src/tss2-esys/api/Esys_GetCommandAuditDigest.c
+++ b/src/tss2-esys/api/Esys_GetCommandAuditDigest.c
@@ -172,6 +172,9 @@
const TPMT_SIG_SCHEME *inScheme)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, privacyHandle=%"PRIx32 ", signHandle=%"PRIx32 ","
+ "qualifyingData=%p, inScheme=%p",
+ esysContext, privacyHandle, signHandle, qualifyingData, inScheme);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *privacyHandleNode;
RSRC_NODE_T *signHandleNode;
@@ -254,8 +257,10 @@
TPM2B_ATTEST **auditInfo,
TPMT_SIGNATURE **signature)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, auditInfo=%p, signature=%p",
+ esysContext, auditInfo, signature);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -346,8 +351,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, auditInfo=%p, signature=%p",
- esysContext, auditInfo, signature);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_GetRandom.c b/src/tss2-esys/api/Esys_GetRandom.c
index 34ac952..e794dd6 100644
--- a/src/tss2-esys/api/Esys_GetRandom.c
+++ b/src/tss2-esys/api/Esys_GetRandom.c
@@ -131,6 +131,8 @@
UINT16 bytesRequested)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, bytesRequested=%04"PRIx16"",
+ esysContext, bytesRequested);
TSS2L_SYS_AUTH_COMMAND auths;
/* Check context, sequence correctness and set state to error for now */
@@ -196,8 +198,10 @@
ESYS_CONTEXT *esysContext,
TPM2B_DIGEST **randomBytes)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, randomBytes=%p",
+ esysContext, randomBytes);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -278,8 +282,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, randomBytes=%p",
- esysContext, randomBytes);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_GetSessionAuditDigest.c b/src/tss2-esys/api/Esys_GetSessionAuditDigest.c
index 616068a..9f3ffed 100644
--- a/src/tss2-esys/api/Esys_GetSessionAuditDigest.c
+++ b/src/tss2-esys/api/Esys_GetSessionAuditDigest.c
@@ -181,6 +181,10 @@
const TPMT_SIG_SCHEME *inScheme)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, privacyAdminHandle=%"PRIx32 ", signHandle=%"PRIx32 ","
+ "sessionHandle=%"PRIx32 ", qualifyingData=%p, inScheme=%p",
+ esysContext, privacyAdminHandle, signHandle, sessionHandle, qualifyingData,
+ inScheme);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *privacyAdminHandleNode;
RSRC_NODE_T *signHandleNode;
@@ -267,8 +271,10 @@
TPM2B_ATTEST **auditInfo,
TPMT_SIGNATURE **signature)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, auditInfo=%p, signature=%p",
+ esysContext, auditInfo, signature);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -360,8 +366,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, auditInfo=%p, signature=%p",
- esysContext, auditInfo, signature);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_GetTestResult.c b/src/tss2-esys/api/Esys_GetTestResult.c
index 060dfbb..4dbe9a5 100644
--- a/src/tss2-esys/api/Esys_GetTestResult.c
+++ b/src/tss2-esys/api/Esys_GetTestResult.c
@@ -123,6 +123,8 @@
ESYS_TR shandle3)
{
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
TSS2L_SYS_AUTH_COMMAND auths;
/* Check context, sequence correctness and set state to error for now */
@@ -188,8 +190,10 @@
TPM2B_MAX_BUFFER **outData,
TPM2_RC *testResult)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, outData=%p, testResult=%p",
+ esysContext, outData, testResult);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -270,8 +274,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, outData=%p, testResult=%p",
- esysContext, outData, testResult);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_GetTime.c b/src/tss2-esys/api/Esys_GetTime.c
index 2aa8839..fe695f5 100644
--- a/src/tss2-esys/api/Esys_GetTime.c
+++ b/src/tss2-esys/api/Esys_GetTime.c
@@ -172,6 +172,9 @@
const TPMT_SIG_SCHEME *inScheme)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, privacyAdminHandle=%"PRIx32 ", signHandle=%"PRIx32 ","
+ "qualifyingData=%p, inScheme=%p",
+ esysContext, privacyAdminHandle, signHandle, qualifyingData, inScheme);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *privacyAdminHandleNode;
RSRC_NODE_T *signHandleNode;
@@ -254,8 +257,10 @@
TPM2B_ATTEST **timeInfo,
TPMT_SIGNATURE **signature)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, timeInfo=%p, signature=%p",
+ esysContext, timeInfo, signature);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -346,8 +351,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, timeInfo=%p, signature=%p",
- esysContext, timeInfo, signature);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_HMAC.c b/src/tss2-esys/api/Esys_HMAC.c
index d8a46ff..1aed634 100644
--- a/src/tss2-esys/api/Esys_HMAC.c
+++ b/src/tss2-esys/api/Esys_HMAC.c
@@ -153,6 +153,9 @@
TPMI_ALG_HASH hashAlg)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, handle=%"PRIx32 ", buffer=%p,"
+ "hashAlg=%04"PRIx16"",
+ esysContext, handle, buffer, hashAlg);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *handleNode;
@@ -227,8 +230,10 @@
ESYS_CONTEXT *esysContext,
TPM2B_DIGEST **outHMAC)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, outHMAC=%p",
+ esysContext, outHMAC);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -311,8 +316,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, outHMAC=%p",
- esysContext, outHMAC);
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 d42261a..2ef2d26 100644
--- a/src/tss2-esys/api/Esys_HMAC_Start.c
+++ b/src/tss2-esys/api/Esys_HMAC_Start.c
@@ -152,6 +152,9 @@
TPMI_ALG_HASH hashAlg)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, handle=%"PRIx32 ", auth=%p,"
+ "hashAlg=%04"PRIx16"",
+ esysContext, handle, auth, hashAlg);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *handleNode;
@@ -225,8 +228,10 @@
ESYS_CONTEXT *esysContext,
ESYS_TR *sequenceHandle)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, sequenceHandle=%p",
+ esysContext, sequenceHandle);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -319,8 +324,6 @@
/* Store the auth value parameter in the object meta data */
sequenceHandleNode->auth = *esysContext->in.HMAC_Start.auth;
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, sequenceHandle=%p",
- esysContext, sequenceHandle);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_Hash.c b/src/tss2-esys/api/Esys_Hash.c
index 06789d4..cb85891 100644
--- a/src/tss2-esys/api/Esys_Hash.c
+++ b/src/tss2-esys/api/Esys_Hash.c
@@ -155,6 +155,9 @@
TPMI_RH_HIERARCHY hierarchy)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, data=%p, hashAlg=%04"PRIx16","
+ "hierarchy=%"PRIx32 "",
+ esysContext, data, hashAlg, hierarchy);
TSS2L_SYS_AUTH_COMMAND auths;
/* Check context, sequence correctness and set state to error for now */
@@ -227,8 +230,10 @@
TPM2B_DIGEST **outHash,
TPMT_TK_HASHCHECK **validation)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, outHash=%p, validation=%p",
+ esysContext, outHash, validation);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -318,8 +323,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, outHash=%p, validation=%p",
- esysContext, outHash, validation);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_HashSequenceStart.c b/src/tss2-esys/api/Esys_HashSequenceStart.c
index e1242d7..0460ff9 100644
--- a/src/tss2-esys/api/Esys_HashSequenceStart.c
+++ b/src/tss2-esys/api/Esys_HashSequenceStart.c
@@ -143,6 +143,8 @@
TPMI_ALG_HASH hashAlg)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, auth=%p, hashAlg=%04"PRIx16"",
+ esysContext, auth, hashAlg);
TSS2L_SYS_AUTH_COMMAND auths;
/* Check context, sequence correctness and set state to error for now */
@@ -209,8 +211,10 @@
ESYS_CONTEXT *esysContext,
ESYS_TR *sequenceHandle)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, sequenceHandle=%p",
+ esysContext, sequenceHandle);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -299,8 +303,6 @@
sequenceHandleNode->rsrc.name.size = 0;
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, sequenceHandle=%p",
- esysContext, sequenceHandle);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_HierarchyChangeAuth.c b/src/tss2-esys/api/Esys_HierarchyChangeAuth.c
index 85920fb..a796de5 100644
--- a/src/tss2-esys/api/Esys_HierarchyChangeAuth.c
+++ b/src/tss2-esys/api/Esys_HierarchyChangeAuth.c
@@ -142,6 +142,8 @@
const TPM2B_AUTH *newAuth)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, authHandle=%"PRIx32 ", newAuth=%p",
+ esysContext, authHandle, newAuth);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authHandleNode;
@@ -214,8 +216,10 @@
ESYS_TR authHandle;
RSRC_NODE_T *authHandleNode;
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -298,8 +302,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_HierarchyControl.c b/src/tss2-esys/api/Esys_HierarchyControl.c
index 7080ca8..0937cdd 100644
--- a/src/tss2-esys/api/Esys_HierarchyControl.c
+++ b/src/tss2-esys/api/Esys_HierarchyControl.c
@@ -143,6 +143,9 @@
TPMI_YES_NO state)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, authHandle=%"PRIx32 ", enable=%"PRIx32 ","
+ "state=%02"PRIx8"",
+ esysContext, authHandle, enable, state);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authHandleNode;
@@ -214,8 +217,10 @@
Esys_HierarchyControl_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -288,8 +293,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_Import.c b/src/tss2-esys/api/Esys_Import.c
index 2e8729e..57ca54b 100644
--- a/src/tss2-esys/api/Esys_Import.c
+++ b/src/tss2-esys/api/Esys_Import.c
@@ -198,6 +198,11 @@
const TPMT_SYM_DEF_OBJECT *symmetricAlg)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, parentHandle=%"PRIx32 ", encryptionKey=%p,"
+ "objectPublic=%p, duplicate=%p, inSymSeed=%p,"
+ "symmetricAlg=%p",
+ esysContext, parentHandle, encryptionKey, objectPublic, duplicate,
+ inSymSeed, symmetricAlg);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *parentHandleNode;
@@ -278,8 +283,10 @@
ESYS_CONTEXT *esysContext,
TPM2B_PRIVATE **outPrivate)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, outPrivate=%p",
+ esysContext, outPrivate);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -365,8 +372,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, outPrivate=%p",
- esysContext, outPrivate);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_IncrementalSelfTest.c b/src/tss2-esys/api/Esys_IncrementalSelfTest.c
index b6f71d6..fa90253 100644
--- a/src/tss2-esys/api/Esys_IncrementalSelfTest.c
+++ b/src/tss2-esys/api/Esys_IncrementalSelfTest.c
@@ -137,6 +137,8 @@
const TPML_ALG *toTest)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, toTest=%p",
+ esysContext, toTest);
TSS2L_SYS_AUTH_COMMAND auths;
/* Check context, sequence correctness and set state to error for now */
@@ -202,8 +204,10 @@
ESYS_CONTEXT *esysContext,
TPML_ALG **toDoList)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, toDoList=%p",
+ esysContext, toDoList);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -284,8 +288,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, toDoList=%p",
- esysContext, toDoList);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_Load.c b/src/tss2-esys/api/Esys_Load.c
index 458649c..1831532 100644
--- a/src/tss2-esys/api/Esys_Load.c
+++ b/src/tss2-esys/api/Esys_Load.c
@@ -158,6 +158,9 @@
const TPM2B_PUBLIC *inPublic)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, parentHandle=%"PRIx32 ", inPrivate=%p,"
+ "inPublic=%p",
+ esysContext, parentHandle, inPrivate, inPublic);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *parentHandleNode;
@@ -231,8 +234,10 @@
ESYS_CONTEXT *esysContext,
ESYS_TR *objectHandle)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, objectHandle=%p",
+ esysContext, objectHandle);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -333,8 +338,6 @@
}
objectHandleNode->rsrc.name = name;
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, objectHandle=%p",
- esysContext, objectHandle);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_LoadExternal.c b/src/tss2-esys/api/Esys_LoadExternal.c
index fcf6b5a..b998a34 100644
--- a/src/tss2-esys/api/Esys_LoadExternal.c
+++ b/src/tss2-esys/api/Esys_LoadExternal.c
@@ -156,6 +156,9 @@
TPMI_RH_HIERARCHY hierarchy)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, inPrivate=%p, inPublic=%p,"
+ "hierarchy=%"PRIx32 "",
+ esysContext, inPrivate, inPublic, hierarchy);
TSS2L_SYS_AUTH_COMMAND auths;
/* Check context, sequence correctness and set state to error for now */
@@ -224,8 +227,10 @@
ESYS_CONTEXT *esysContext,
ESYS_TR *objectHandle)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, objectHandle=%p",
+ esysContext, objectHandle);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -324,8 +329,6 @@
}
objectHandleNode->rsrc.name = name;
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, objectHandle=%p",
- esysContext, objectHandle);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_MakeCredential.c b/src/tss2-esys/api/Esys_MakeCredential.c
index 272b247..924e845 100644
--- a/src/tss2-esys/api/Esys_MakeCredential.c
+++ b/src/tss2-esys/api/Esys_MakeCredential.c
@@ -163,6 +163,9 @@
const TPM2B_NAME *objectName)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, handle=%"PRIx32 ", credential=%p,"
+ "objectName=%p",
+ esysContext, handle, credential, objectName);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *handleNode;
@@ -239,8 +242,10 @@
TPM2B_ID_OBJECT **credentialBlob,
TPM2B_ENCRYPTED_SECRET **secret)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, credentialBlob=%p, secret=%p",
+ esysContext, credentialBlob, secret);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -330,8 +335,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, credentialBlob=%p, secret=%p",
- esysContext, credentialBlob, secret);
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 f873c2b..fa96874 100644
--- a/src/tss2-esys/api/Esys_NV_Certify.c
+++ b/src/tss2-esys/api/Esys_NV_Certify.c
@@ -195,6 +195,11 @@
UINT16 offset)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, signHandle=%"PRIx32 ", authHandle=%"PRIx32 ","
+ "nvIndex=%"PRIx32 ", qualifyingData=%p, inScheme=%p,"
+ "size=%04"PRIx16", offset=%04"PRIx16"",
+ esysContext, signHandle, authHandle, nvIndex, qualifyingData,
+ inScheme, size, offset);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *signHandleNode;
RSRC_NODE_T *authHandleNode;
@@ -285,8 +290,10 @@
TPM2B_ATTEST **certifyInfo,
TPMT_SIGNATURE **signature)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, certifyInfo=%p, signature=%p",
+ esysContext, certifyInfo, signature);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -380,8 +387,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, certifyInfo=%p, signature=%p",
- esysContext, certifyInfo, signature);
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 dee15ec..6767451 100644
--- a/src/tss2-esys/api/Esys_NV_ChangeAuth.c
+++ b/src/tss2-esys/api/Esys_NV_ChangeAuth.c
@@ -142,6 +142,8 @@
const TPM2B_AUTH *newAuth)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, nvIndex=%"PRIx32 ", newAuth=%p",
+ esysContext, nvIndex, newAuth);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *nvIndexNode;
@@ -214,8 +216,10 @@
ESYS_TR nvIndex;
RSRC_NODE_T *nvIndexNode;
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -298,8 +302,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
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 f66da78..208d36c 100644
--- a/src/tss2-esys/api/Esys_NV_DefineSpace.c
+++ b/src/tss2-esys/api/Esys_NV_DefineSpace.c
@@ -158,6 +158,9 @@
const TPM2B_NV_PUBLIC *publicInfo)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, authHandle=%"PRIx32 ", auth=%p,"
+ "publicInfo=%p",
+ esysContext, authHandle, auth, publicInfo);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authHandleNode;
@@ -241,8 +244,10 @@
ESYS_CONTEXT *esysContext,
ESYS_TR *nvHandle)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, nvHandle=%p",
+ esysContext, nvHandle);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -343,8 +348,6 @@
*esysContext->in.NV_DefineSpace.publicInfo;
nvHandleNode->auth = *esysContext->in.NV_DefineSpace.auth;
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, nvHandle=%p",
- esysContext, nvHandle);
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 b835047..7054063 100644
--- a/src/tss2-esys/api/Esys_NV_Extend.c
+++ b/src/tss2-esys/api/Esys_NV_Extend.c
@@ -151,6 +151,9 @@
const TPM2B_MAX_NV_BUFFER *data)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, authHandle=%"PRIx32 ", nvIndex=%"PRIx32 ","
+ "data=%p",
+ esysContext, authHandle, nvIndex, data);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authHandleNode;
RSRC_NODE_T *nvIndexNode;
@@ -224,8 +227,10 @@
Esys_NV_Extend_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -298,8 +303,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
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 aadeae7..9e807e1 100644
--- a/src/tss2-esys/api/Esys_NV_GlobalWriteLock.c
+++ b/src/tss2-esys/api/Esys_NV_GlobalWriteLock.c
@@ -129,6 +129,8 @@
ESYS_TR shandle3)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, authHandle=%"PRIx32 "",
+ esysContext, authHandle);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authHandleNode;
@@ -196,8 +198,10 @@
Esys_NV_GlobalWriteLock_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -268,8 +272,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
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 edb8b11..8e86a91 100644
--- a/src/tss2-esys/api/Esys_NV_Increment.c
+++ b/src/tss2-esys/api/Esys_NV_Increment.c
@@ -138,6 +138,8 @@
ESYS_TR shandle3)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, authHandle=%"PRIx32 ", nvIndex=%"PRIx32 "",
+ esysContext, authHandle, nvIndex);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authHandleNode;
RSRC_NODE_T *nvIndexNode;
@@ -209,8 +211,10 @@
Esys_NV_Increment_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -295,8 +299,6 @@
return_if_error(r, "Error get nvname")
}
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
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 1d02f1b..5220f99 100644
--- a/src/tss2-esys/api/Esys_NV_Read.c
+++ b/src/tss2-esys/api/Esys_NV_Read.c
@@ -156,6 +156,9 @@
UINT16 offset)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, authHandle=%"PRIx32 ", nvIndex=%"PRIx32 ","
+ "size=%04"PRIx16", offset=%04"PRIx16"",
+ esysContext, authHandle, nvIndex, size, offset);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authHandleNode;
RSRC_NODE_T *nvIndexNode;
@@ -234,8 +237,10 @@
ESYS_CONTEXT *esysContext,
TPM2B_MAX_NV_BUFFER **data)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, data=%p",
+ esysContext, data);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -319,8 +324,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, data=%p",
- esysContext, data);
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 0a4682b..1d268c4 100644
--- a/src/tss2-esys/api/Esys_NV_ReadLock.c
+++ b/src/tss2-esys/api/Esys_NV_ReadLock.c
@@ -138,6 +138,8 @@
ESYS_TR shandle3)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, authHandle=%"PRIx32 ", nvIndex=%"PRIx32 "",
+ esysContext, authHandle, nvIndex);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authHandleNode;
RSRC_NODE_T *nvIndexNode;
@@ -209,8 +211,10 @@
Esys_NV_ReadLock_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -295,8 +299,6 @@
return_if_error(r, "Error get nvname")
}
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
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 d7db690..55617dc 100644
--- a/src/tss2-esys/api/Esys_NV_ReadPublic.c
+++ b/src/tss2-esys/api/Esys_NV_ReadPublic.c
@@ -137,6 +137,8 @@
ESYS_TR shandle3)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, nvIndex=%"PRIx32 "",
+ esysContext, nvIndex);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *nvIndexNode;
@@ -211,8 +213,10 @@
{
TPM2B_NV_PUBLIC *lnvPublic = NULL;
TPM2B_NAME *lnvName = NULL;
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, nvPublic=%p, nvName=%p",
+ esysContext, nvPublic, nvName);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -318,8 +322,6 @@
SAFE_FREE(lnvName);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, nvPublic=%p, nvName=%p",
- esysContext, nvPublic, nvName);
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 9c81463..4e07c3f 100644
--- a/src/tss2-esys/api/Esys_NV_SetBits.c
+++ b/src/tss2-esys/api/Esys_NV_SetBits.c
@@ -145,6 +145,9 @@
UINT64 bits)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, authHandle=%"PRIx32 ", nvIndex=%"PRIx32 ","
+ "bits=%"PRIx64"",
+ esysContext, authHandle, nvIndex, bits);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authHandleNode;
RSRC_NODE_T *nvIndexNode;
@@ -218,8 +221,10 @@
Esys_NV_SetBits_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -305,8 +310,6 @@
return_if_error(r, "Error get nvname")
}
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
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 f56735c..2958e4d 100644
--- a/src/tss2-esys/api/Esys_NV_UndefineSpace.c
+++ b/src/tss2-esys/api/Esys_NV_UndefineSpace.c
@@ -138,6 +138,8 @@
ESYS_TR shandle3)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, authHandle=%"PRIx32 ", nvIndex=%"PRIx32 "",
+ esysContext, authHandle, nvIndex);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authHandleNode;
RSRC_NODE_T *nvIndexNode;
@@ -209,8 +211,10 @@
Esys_NV_UndefineSpace_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -286,8 +290,6 @@
return_if_error(r, "invalidate object");
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
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 06c7144..23472f5 100644
--- a/src/tss2-esys/api/Esys_NV_UndefineSpaceSpecial.c
+++ b/src/tss2-esys/api/Esys_NV_UndefineSpaceSpecial.c
@@ -138,6 +138,8 @@
ESYS_TR shandle3)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, nvIndex=%"PRIx32 ", platform=%"PRIx32 "",
+ esysContext, nvIndex, platform);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *nvIndexNode;
RSRC_NODE_T *platformNode;
@@ -210,8 +212,10 @@
Esys_NV_UndefineSpaceSpecial_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -283,8 +287,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
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 5cb9de1..e8f8191 100644
--- a/src/tss2-esys/api/Esys_NV_Write.c
+++ b/src/tss2-esys/api/Esys_NV_Write.c
@@ -158,6 +158,9 @@
UINT16 offset)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, authHandle=%"PRIx32 ", nvIndex=%"PRIx32 ","
+ "data=%p, offset=%04"PRIx16"",
+ esysContext, authHandle, nvIndex, data, offset);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authHandleNode;
RSRC_NODE_T *nvIndexNode;
@@ -233,8 +236,10 @@
Esys_NV_Write_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -321,8 +326,6 @@
return_if_error(r, "Error get nvname")
}
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
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 03b76ea..025aee6 100644
--- a/src/tss2-esys/api/Esys_NV_WriteLock.c
+++ b/src/tss2-esys/api/Esys_NV_WriteLock.c
@@ -138,6 +138,8 @@
ESYS_TR shandle3)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, authHandle=%"PRIx32 ", nvIndex=%"PRIx32 "",
+ esysContext, authHandle, nvIndex);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authHandleNode;
RSRC_NODE_T *nvIndexNode;
@@ -209,8 +211,10 @@
Esys_NV_WriteLock_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -295,8 +299,6 @@
return_if_error(r, "Error get nvname")
}
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_ObjectChangeAuth.c b/src/tss2-esys/api/Esys_ObjectChangeAuth.c
index 14cb324..9adab2f 100644
--- a/src/tss2-esys/api/Esys_ObjectChangeAuth.c
+++ b/src/tss2-esys/api/Esys_ObjectChangeAuth.c
@@ -155,6 +155,9 @@
const TPM2B_AUTH *newAuth)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, objectHandle=%"PRIx32 ", parentHandle=%"PRIx32 ","
+ "newAuth=%p",
+ esysContext, objectHandle, parentHandle, newAuth);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *objectHandleNode;
RSRC_NODE_T *parentHandleNode;
@@ -231,8 +234,10 @@
ESYS_CONTEXT *esysContext,
TPM2B_PRIVATE **outPrivate)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, outPrivate=%p",
+ esysContext, outPrivate);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -315,8 +320,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, outPrivate=%p",
- esysContext, outPrivate);
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 11e3356..c2d323a 100644
--- a/src/tss2-esys/api/Esys_PCR_Allocate.c
+++ b/src/tss2-esys/api/Esys_PCR_Allocate.c
@@ -158,6 +158,8 @@
const TPML_PCR_SELECTION *pcrAllocation)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, authHandle=%"PRIx32 ", pcrAllocation=%p",
+ esysContext, authHandle, pcrAllocation);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authHandleNode;
@@ -239,8 +241,12 @@
UINT32 *sizeNeeded,
UINT32 *sizeAvailable)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, allocationSuccess=%p, maxPCR=%p,"
+ "sizeNeeded=%p, sizeAvailable=%p",
+ esysContext, allocationSuccess, maxPCR,
+ sizeNeeded, sizeAvailable);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -316,10 +322,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, allocationSuccess=%p, maxPCR=%p,"
- "sizeNeeded=%p, sizeAvailable=%p",
- esysContext, allocationSuccess, maxPCR,
- sizeNeeded, sizeAvailable);
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 f406bb3..514c068 100644
--- a/src/tss2-esys/api/Esys_PCR_Event.c
+++ b/src/tss2-esys/api/Esys_PCR_Event.c
@@ -146,6 +146,8 @@
const TPM2B_EVENT *eventData)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, pcrHandle=%"PRIx32 ", eventData=%p",
+ esysContext, pcrHandle, eventData);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *pcrHandleNode;
@@ -218,8 +220,10 @@
ESYS_CONTEXT *esysContext,
TPML_DIGEST_VALUES **digests)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, digests=%p",
+ esysContext, digests);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -301,8 +305,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, digests=%p",
- esysContext, digests);
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 10155f3..e25857e 100644
--- a/src/tss2-esys/api/Esys_PCR_Extend.c
+++ b/src/tss2-esys/api/Esys_PCR_Extend.c
@@ -142,6 +142,8 @@
const TPML_DIGEST_VALUES *digests)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, pcrHandle=%"PRIx32 ", digests=%p",
+ esysContext, pcrHandle, digests);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *pcrHandleNode;
@@ -211,8 +213,10 @@
Esys_PCR_Extend_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -284,8 +288,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
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 facf11b..6956fb3 100644
--- a/src/tss2-esys/api/Esys_PCR_Read.c
+++ b/src/tss2-esys/api/Esys_PCR_Read.c
@@ -145,6 +145,8 @@
const TPML_PCR_SELECTION *pcrSelectionIn)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, pcrSelectionIn=%p",
+ esysContext, pcrSelectionIn);
TSS2L_SYS_AUTH_COMMAND auths;
/* Check context, sequence correctness and set state to error for now */
@@ -216,8 +218,12 @@
TPML_PCR_SELECTION **pcrSelectionOut,
TPML_DIGEST **pcrValues)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, pcrUpdateCounter=%p, pcrSelectionOut=%p,"
+ "pcrValues=%p",
+ esysContext, pcrUpdateCounter, pcrSelectionOut,
+ pcrValues);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -306,10 +312,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, pcrUpdateCounter=%p, pcrSelectionOut=%p,"
- "pcrValues=%p",
- esysContext, pcrUpdateCounter, pcrSelectionOut,
- pcrValues);
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 5a246a8..a575ed8 100644
--- a/src/tss2-esys/api/Esys_PCR_Reset.c
+++ b/src/tss2-esys/api/Esys_PCR_Reset.c
@@ -129,6 +129,8 @@
ESYS_TR shandle3)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, pcrHandle=%"PRIx32 "",
+ esysContext, pcrHandle);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *pcrHandleNode;
@@ -196,8 +198,10 @@
Esys_PCR_Reset_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -268,8 +272,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
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 2136f0e..8b2eb13 100644
--- a/src/tss2-esys/api/Esys_PCR_SetAuthPolicy.c
+++ b/src/tss2-esys/api/Esys_PCR_SetAuthPolicy.c
@@ -156,6 +156,9 @@
TPMI_DH_PCR pcrNum)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, authHandle=%"PRIx32 ", authPolicy=%p,"
+ "hashAlg=%04"PRIx16", pcrNum=%"PRIx32 "",
+ esysContext, authHandle, authPolicy, hashAlg, pcrNum);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authHandleNode;
@@ -229,8 +232,10 @@
Esys_PCR_SetAuthPolicy_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -304,8 +309,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
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 0e0f062..9580147 100644
--- a/src/tss2-esys/api/Esys_PCR_SetAuthValue.c
+++ b/src/tss2-esys/api/Esys_PCR_SetAuthValue.c
@@ -142,6 +142,8 @@
const TPM2B_DIGEST *auth)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, pcrHandle=%"PRIx32 ", auth=%p",
+ esysContext, pcrHandle, auth);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *pcrHandleNode;
@@ -211,8 +213,10 @@
Esys_PCR_SetAuthValue_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -284,8 +288,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
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 5acc5be..b65c56f 100644
--- a/src/tss2-esys/api/Esys_PP_Commands.c
+++ b/src/tss2-esys/api/Esys_PP_Commands.c
@@ -155,6 +155,9 @@
const TPML_CC *clearList)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, auth=%"PRIx32 ", setList=%p,"
+ "clearList=%p",
+ esysContext, auth, setList, clearList);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authNode;
@@ -226,8 +229,10 @@
Esys_PP_Commands_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -300,8 +305,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_PolicyAuthValue.c b/src/tss2-esys/api/Esys_PolicyAuthValue.c
index 05eb292..eb192fb 100644
--- a/src/tss2-esys/api/Esys_PolicyAuthValue.c
+++ b/src/tss2-esys/api/Esys_PolicyAuthValue.c
@@ -129,6 +129,8 @@
ESYS_TR shandle3)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, policySession=%"PRIx32 "",
+ esysContext, policySession);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *policySessionNode;
@@ -195,8 +197,10 @@
Esys_PolicyAuthValue_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -275,8 +279,6 @@
/* 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;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_PolicyAuthorize.c b/src/tss2-esys/api/Esys_PolicyAuthorize.c
index 7eac04b..d705501 100644
--- a/src/tss2-esys/api/Esys_PolicyAuthorize.c
+++ b/src/tss2-esys/api/Esys_PolicyAuthorize.c
@@ -181,6 +181,10 @@
const TPMT_TK_VERIFIED *checkTicket)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, policySession=%"PRIx32 ", approvedPolicy=%p,"
+ "policyRef=%p, keySign=%p, checkTicket=%p",
+ esysContext, policySession, approvedPolicy, policyRef, keySign,
+ checkTicket);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *policySessionNode;
@@ -255,8 +259,10 @@
Esys_PolicyAuthorize_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -331,8 +337,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_PolicyAuthorizeNV.c b/src/tss2-esys/api/Esys_PolicyAuthorizeNV.c
index f488f43..97378a1 100644
--- a/src/tss2-esys/api/Esys_PolicyAuthorizeNV.c
+++ b/src/tss2-esys/api/Esys_PolicyAuthorizeNV.c
@@ -147,6 +147,9 @@
ESYS_TR shandle3)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, authHandle=%"PRIx32 ", nvIndex=%"PRIx32 ","
+ "policySession=%"PRIx32 "",
+ esysContext, authHandle, nvIndex, policySession);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authHandleNode;
RSRC_NODE_T *nvIndexNode;
@@ -222,8 +225,10 @@
Esys_PolicyAuthorizeNV_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -296,8 +301,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_PolicyCommandCode.c b/src/tss2-esys/api/Esys_PolicyCommandCode.c
index f421591..fa1e452 100644
--- a/src/tss2-esys/api/Esys_PolicyCommandCode.c
+++ b/src/tss2-esys/api/Esys_PolicyCommandCode.c
@@ -136,6 +136,8 @@
TPM2_CC code)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, policySession=%"PRIx32 ", code=%"PRIx32 "",
+ esysContext, policySession, code);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *policySessionNode;
@@ -204,8 +206,10 @@
Esys_PolicyCommandCode_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -277,8 +281,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_PolicyCounterTimer.c b/src/tss2-esys/api/Esys_PolicyCounterTimer.c
index cd4ff43..3c33f4b 100644
--- a/src/tss2-esys/api/Esys_PolicyCounterTimer.c
+++ b/src/tss2-esys/api/Esys_PolicyCounterTimer.c
@@ -156,6 +156,9 @@
TPM2_EO operation)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, policySession=%"PRIx32 ", operandB=%p,"
+ "offset=%04"PRIx16", operation=%04"PRIx16"",
+ esysContext, policySession, operandB, offset, operation);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *policySessionNode;
@@ -228,8 +231,10 @@
Esys_PolicyCounterTimer_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -303,8 +308,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_PolicyCpHash.c b/src/tss2-esys/api/Esys_PolicyCpHash.c
index 7fce503..d59e2e9 100644
--- a/src/tss2-esys/api/Esys_PolicyCpHash.c
+++ b/src/tss2-esys/api/Esys_PolicyCpHash.c
@@ -140,6 +140,8 @@
const TPM2B_DIGEST *cpHashA)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, policySession=%"PRIx32 ", cpHashA=%p",
+ esysContext, policySession, cpHashA);
TSS2L_SYS_AUTH_COMMAND auths;
/* Check context, sequence correctness and set state to error for now */
@@ -204,8 +206,10 @@
Esys_PolicyCpHash_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -277,8 +281,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_PolicyDuplicationSelect.c b/src/tss2-esys/api/Esys_PolicyDuplicationSelect.c
index b77d566..ba62404 100644
--- a/src/tss2-esys/api/Esys_PolicyDuplicationSelect.c
+++ b/src/tss2-esys/api/Esys_PolicyDuplicationSelect.c
@@ -160,6 +160,9 @@
TPMI_YES_NO includeObject)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, policySession=%"PRIx32 ", objectName=%p,"
+ "newParentName=%p, includeObject=%02"PRIx8"",
+ esysContext, policySession, objectName, newParentName, includeObject);
TSS2L_SYS_AUTH_COMMAND auths;
/* Check context, sequence correctness and set state to error for now */
@@ -228,8 +231,10 @@
Esys_PolicyDuplicationSelect_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -303,8 +308,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_PolicyGetDigest.c b/src/tss2-esys/api/Esys_PolicyGetDigest.c
index d0091cc..1252623 100644
--- a/src/tss2-esys/api/Esys_PolicyGetDigest.c
+++ b/src/tss2-esys/api/Esys_PolicyGetDigest.c
@@ -133,6 +133,8 @@
ESYS_TR shandle3)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, policySession=%"PRIx32 "",
+ esysContext, policySession);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *policySessionNode;
@@ -202,8 +204,10 @@
ESYS_CONTEXT *esysContext,
TPM2B_DIGEST **policyDigest)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, policyDigest=%p",
+ esysContext, policyDigest);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -284,8 +288,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, policyDigest=%p",
- esysContext, policyDigest);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_PolicyLocality.c b/src/tss2-esys/api/Esys_PolicyLocality.c
index 784193a..35ac3b4 100644
--- a/src/tss2-esys/api/Esys_PolicyLocality.c
+++ b/src/tss2-esys/api/Esys_PolicyLocality.c
@@ -134,6 +134,8 @@
TPMA_LOCALITY locality)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, policySession=%"PRIx32 ", locality=%02"PRIx8"",
+ esysContext, policySession, locality);
TSS2L_SYS_AUTH_COMMAND auths;
/* Check context, sequence correctness and set state to error for now */
@@ -198,8 +200,10 @@
Esys_PolicyLocality_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -271,8 +275,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_PolicyNV.c b/src/tss2-esys/api/Esys_PolicyNV.c
index 88cdf3b..cee35cf 100644
--- a/src/tss2-esys/api/Esys_PolicyNV.c
+++ b/src/tss2-esys/api/Esys_PolicyNV.c
@@ -174,6 +174,11 @@
TPM2_EO operation)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, authHandle=%"PRIx32 ", nvIndex=%"PRIx32 ","
+ "policySession=%"PRIx32 ", operandB=%p, offset=%04"PRIx16","
+ "operation=%04"PRIx16"",
+ esysContext, authHandle, nvIndex, policySession, operandB,
+ offset, operation);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authHandleNode;
RSRC_NODE_T *nvIndexNode;
@@ -255,8 +260,10 @@
Esys_PolicyNV_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -332,8 +339,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_PolicyNameHash.c b/src/tss2-esys/api/Esys_PolicyNameHash.c
index b0114e4..dd3f461 100644
--- a/src/tss2-esys/api/Esys_PolicyNameHash.c
+++ b/src/tss2-esys/api/Esys_PolicyNameHash.c
@@ -140,6 +140,8 @@
const TPM2B_DIGEST *nameHash)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, policySession=%"PRIx32 ", nameHash=%p",
+ esysContext, policySession, nameHash);
TSS2L_SYS_AUTH_COMMAND auths;
/* Check context, sequence correctness and set state to error for now */
@@ -204,8 +206,10 @@
Esys_PolicyNameHash_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -277,8 +281,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_PolicyNvWritten.c b/src/tss2-esys/api/Esys_PolicyNvWritten.c
index e1e57eb..1880e41 100644
--- a/src/tss2-esys/api/Esys_PolicyNvWritten.c
+++ b/src/tss2-esys/api/Esys_PolicyNvWritten.c
@@ -136,6 +136,8 @@
TPMI_YES_NO writtenSet)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, policySession=%"PRIx32 ", writtenSet=%02"PRIx8"",
+ esysContext, policySession, writtenSet);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *policySessionNode;
@@ -204,8 +206,10 @@
Esys_PolicyNvWritten_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -277,8 +281,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_PolicyOR.c b/src/tss2-esys/api/Esys_PolicyOR.c
index d0abfbf..d9b645d 100644
--- a/src/tss2-esys/api/Esys_PolicyOR.c
+++ b/src/tss2-esys/api/Esys_PolicyOR.c
@@ -142,6 +142,8 @@
const TPML_DIGEST *pHashList)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, policySession=%"PRIx32 ", pHashList=%p",
+ esysContext, policySession, pHashList);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *policySessionNode;
@@ -210,8 +212,10 @@
Esys_PolicyOR_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -283,8 +287,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_PolicyPCR.c b/src/tss2-esys/api/Esys_PolicyPCR.c
index eca8eae..48907f4 100644
--- a/src/tss2-esys/api/Esys_PolicyPCR.c
+++ b/src/tss2-esys/api/Esys_PolicyPCR.c
@@ -155,6 +155,9 @@
const TPML_PCR_SELECTION *pcrs)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, policySession=%"PRIx32 ", pcrDigest=%p,"
+ "pcrs=%p",
+ esysContext, policySession, pcrDigest, pcrs);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *policySessionNode;
@@ -225,8 +228,10 @@
Esys_PolicyPCR_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -299,8 +304,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_PolicyPassword.c b/src/tss2-esys/api/Esys_PolicyPassword.c
index cec466b..e35ec25 100644
--- a/src/tss2-esys/api/Esys_PolicyPassword.c
+++ b/src/tss2-esys/api/Esys_PolicyPassword.c
@@ -129,6 +129,8 @@
ESYS_TR shandle3)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, policySession=%"PRIx32 "",
+ esysContext, policySession);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *policySessionNode;
@@ -195,8 +197,10 @@
Esys_PolicyPassword_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -275,8 +279,6 @@
/* 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;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_PolicyPhysicalPresence.c b/src/tss2-esys/api/Esys_PolicyPhysicalPresence.c
index f54cc56..960734a 100644
--- a/src/tss2-esys/api/Esys_PolicyPhysicalPresence.c
+++ b/src/tss2-esys/api/Esys_PolicyPhysicalPresence.c
@@ -129,6 +129,8 @@
ESYS_TR shandle3)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, policySession=%"PRIx32 "",
+ esysContext, policySession);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *policySessionNode;
@@ -195,8 +197,10 @@
Esys_PolicyPhysicalPresence_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -267,8 +271,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_PolicyRestart.c b/src/tss2-esys/api/Esys_PolicyRestart.c
index 0bdc110..f4a732d 100644
--- a/src/tss2-esys/api/Esys_PolicyRestart.c
+++ b/src/tss2-esys/api/Esys_PolicyRestart.c
@@ -129,6 +129,8 @@
ESYS_TR shandle3)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, sessionHandle=%"PRIx32 "",
+ esysContext, sessionHandle);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *sessionHandleNode;
@@ -195,8 +197,10 @@
Esys_PolicyRestart_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -267,8 +271,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_PolicySecret.c b/src/tss2-esys/api/Esys_PolicySecret.c
index b087675..57efa8a 100644
--- a/src/tss2-esys/api/Esys_PolicySecret.c
+++ b/src/tss2-esys/api/Esys_PolicySecret.c
@@ -192,6 +192,11 @@
INT32 expiration)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, authHandle=%"PRIx32 ", policySession=%"PRIx32 ","
+ "nonceTPM=%p, cpHashA=%p, policyRef=%p,"
+ "expiration=%"PRIi32 "",
+ esysContext, authHandle, policySession, nonceTPM, cpHashA,
+ policyRef, expiration);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authHandleNode;
RSRC_NODE_T *policySessionNode;
@@ -277,8 +282,10 @@
TPM2B_TIMEOUT **timeout,
TPMT_TK_AUTH **policyTicket)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, timeout=%p, policyTicket=%p",
+ esysContext, timeout, policyTicket);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -371,8 +378,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, timeout=%p, policyTicket=%p",
- esysContext, timeout, policyTicket);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_PolicySigned.c b/src/tss2-esys/api/Esys_PolicySigned.c
index 2c5b56f..9cf97fe 100644
--- a/src/tss2-esys/api/Esys_PolicySigned.c
+++ b/src/tss2-esys/api/Esys_PolicySigned.c
@@ -205,6 +205,11 @@
const TPMT_SIGNATURE *auth)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, authObject=%"PRIx32 ", policySession=%"PRIx32 ","
+ "nonceTPM=%p, cpHashA=%p, policyRef=%p,"
+ "expiration=%"PRIi32 ", auth=%p",
+ esysContext, authObject, policySession, nonceTPM, cpHashA,
+ policyRef, expiration, auth);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authObjectNode;
RSRC_NODE_T *policySessionNode;
@@ -291,8 +296,10 @@
TPM2B_TIMEOUT **timeout,
TPMT_TK_AUTH **policyTicket)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, timeout=%p, policyTicket=%p",
+ esysContext, timeout, policyTicket);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -386,8 +393,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, timeout=%p, policyTicket=%p",
- esysContext, timeout, policyTicket);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_PolicyTemplate.c b/src/tss2-esys/api/Esys_PolicyTemplate.c
index 6fae64e..fa794ac 100644
--- a/src/tss2-esys/api/Esys_PolicyTemplate.c
+++ b/src/tss2-esys/api/Esys_PolicyTemplate.c
@@ -140,6 +140,8 @@
const TPM2B_DIGEST *templateHash)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, policySession=%"PRIx32 ", templateHash=%p",
+ esysContext, policySession, templateHash);
TSS2L_SYS_AUTH_COMMAND auths;
/* Check context, sequence correctness and set state to error for now */
@@ -204,8 +206,10 @@
Esys_PolicyTemplate_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -277,8 +281,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_PolicyTicket.c b/src/tss2-esys/api/Esys_PolicyTicket.c
index 4e5a260..72bf855 100644
--- a/src/tss2-esys/api/Esys_PolicyTicket.c
+++ b/src/tss2-esys/api/Esys_PolicyTicket.c
@@ -194,6 +194,11 @@
const TPMT_TK_AUTH *ticket)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, policySession=%"PRIx32 ", timeout=%p,"
+ "cpHashA=%p, policyRef=%p, authName=%p,"
+ "ticket=%p",
+ esysContext, policySession, timeout, cpHashA, policyRef,
+ authName, ticket);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *policySessionNode;
@@ -270,8 +275,10 @@
Esys_PolicyTicket_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -347,8 +354,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_Quote.c b/src/tss2-esys/api/Esys_Quote.c
index e5187d9..d41bc73 100644
--- a/src/tss2-esys/api/Esys_Quote.c
+++ b/src/tss2-esys/api/Esys_Quote.c
@@ -176,6 +176,9 @@
const TPML_PCR_SELECTION *PCRselect)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, signHandle=%"PRIx32 ", qualifyingData=%p,"
+ "inScheme=%p, PCRselect=%p",
+ esysContext, signHandle, qualifyingData, inScheme, PCRselect);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *signHandleNode;
@@ -255,8 +258,10 @@
TPM2B_ATTEST **quoted,
TPMT_SIGNATURE **signature)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, quoted=%p, signature=%p",
+ esysContext, quoted, signature);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -347,8 +352,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, quoted=%p, signature=%p",
- esysContext, quoted, signature);
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 ab133ce..dd7b851 100644
--- a/src/tss2-esys/api/Esys_RSA_Decrypt.c
+++ b/src/tss2-esys/api/Esys_RSA_Decrypt.c
@@ -172,6 +172,9 @@
const TPM2B_DATA *label)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, keyHandle=%"PRIx32 ", cipherText=%p,"
+ "inScheme=%p, label=%p",
+ esysContext, keyHandle, cipherText, inScheme, label);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *keyHandleNode;
@@ -248,8 +251,10 @@
ESYS_CONTEXT *esysContext,
TPM2B_PUBLIC_KEY_RSA **message)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, message=%p",
+ esysContext, message);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -333,8 +338,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, message=%p",
- esysContext, message);
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 db5f125..edabd20 100644
--- a/src/tss2-esys/api/Esys_RSA_Encrypt.c
+++ b/src/tss2-esys/api/Esys_RSA_Encrypt.c
@@ -172,6 +172,9 @@
const TPM2B_DATA *label)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, keyHandle=%"PRIx32 ", message=%p,"
+ "inScheme=%p, label=%p",
+ esysContext, keyHandle, message, inScheme, label);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *keyHandleNode;
@@ -247,8 +250,10 @@
ESYS_CONTEXT *esysContext,
TPM2B_PUBLIC_KEY_RSA **outData)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, outData=%p",
+ esysContext, outData);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -332,8 +337,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, outData=%p",
- esysContext, outData);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_ReadClock.c b/src/tss2-esys/api/Esys_ReadClock.c
index 9d536ce..25f3784 100644
--- a/src/tss2-esys/api/Esys_ReadClock.c
+++ b/src/tss2-esys/api/Esys_ReadClock.c
@@ -119,6 +119,8 @@
ESYS_TR shandle3)
{
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
TSS2L_SYS_AUTH_COMMAND auths;
/* Check context, sequence correctness and set state to error for now */
@@ -181,8 +183,10 @@
ESYS_CONTEXT *esysContext,
TPMS_TIME_INFO **currentTime)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, currentTime=%p",
+ esysContext, currentTime);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -262,8 +266,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, currentTime=%p",
- esysContext, currentTime);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_ReadPublic.c b/src/tss2-esys/api/Esys_ReadPublic.c
index fcee43c..35a899b 100644
--- a/src/tss2-esys/api/Esys_ReadPublic.c
+++ b/src/tss2-esys/api/Esys_ReadPublic.c
@@ -141,6 +141,8 @@
ESYS_TR shandle3)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, objectHandle=%"PRIx32 "",
+ esysContext, objectHandle);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *objectHandleNode;
@@ -216,8 +218,12 @@
TPM2B_NAME **name,
TPM2B_NAME **qualifiedName)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, outPublic=%p, name=%p,"
+ "qualifiedName=%p",
+ esysContext, outPublic, name,
+ qualifiedName);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -312,10 +318,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, outPublic=%p, name=%p,"
- "qualifiedName=%p",
- esysContext, outPublic, name,
- qualifiedName);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_Rewrap.c b/src/tss2-esys/api/Esys_Rewrap.c
index 0626ede..a894fb4 100644
--- a/src/tss2-esys/api/Esys_Rewrap.c
+++ b/src/tss2-esys/api/Esys_Rewrap.c
@@ -185,6 +185,10 @@
const TPM2B_ENCRYPTED_SECRET *inSymSeed)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, oldParent=%"PRIx32 ", newParent=%"PRIx32 ","
+ "inDuplicate=%p, name=%p, inSymSeed=%p",
+ esysContext, oldParent, newParent, inDuplicate, name,
+ inSymSeed);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *oldParentNode;
RSRC_NODE_T *newParentNode;
@@ -268,8 +272,10 @@
TPM2B_PRIVATE **outDuplicate,
TPM2B_ENCRYPTED_SECRET **outSymSeed)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, outDuplicate=%p, outSymSeed=%p",
+ esysContext, outDuplicate, outSymSeed);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -361,8 +367,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, outDuplicate=%p, outSymSeed=%p",
- esysContext, outDuplicate, outSymSeed);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_SelfTest.c b/src/tss2-esys/api/Esys_SelfTest.c
index 2444d0c..3b0e7bf 100644
--- a/src/tss2-esys/api/Esys_SelfTest.c
+++ b/src/tss2-esys/api/Esys_SelfTest.c
@@ -127,6 +127,8 @@
TPMI_YES_NO fullTest)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, fullTest=%02"PRIx8"",
+ esysContext, fullTest);
TSS2L_SYS_AUTH_COMMAND auths;
/* Check context, sequence correctness and set state to error for now */
@@ -189,8 +191,10 @@
Esys_SelfTest_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -261,8 +265,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_SequenceComplete.c b/src/tss2-esys/api/Esys_SequenceComplete.c
index 5627f52..3623408 100644
--- a/src/tss2-esys/api/Esys_SequenceComplete.c
+++ b/src/tss2-esys/api/Esys_SequenceComplete.c
@@ -157,6 +157,9 @@
TPMI_RH_HIERARCHY hierarchy)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, sequenceHandle=%"PRIx32 ", buffer=%p,"
+ "hierarchy=%"PRIx32 "",
+ esysContext, sequenceHandle, buffer, hierarchy);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *sequenceHandleNode;
@@ -234,8 +237,10 @@
TPM2B_DIGEST **result,
TPMT_TK_HASHCHECK **validation)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, result=%p, validation=%p",
+ esysContext, result, validation);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -329,8 +334,6 @@
goto_if_error(r, "invalidate object", error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, result=%p, validation=%p",
- esysContext, result, validation);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_SequenceUpdate.c b/src/tss2-esys/api/Esys_SequenceUpdate.c
index 01633f1..e2a2738 100644
--- a/src/tss2-esys/api/Esys_SequenceUpdate.c
+++ b/src/tss2-esys/api/Esys_SequenceUpdate.c
@@ -142,6 +142,8 @@
const TPM2B_MAX_BUFFER *buffer)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, sequenceHandle=%"PRIx32 ", buffer=%p",
+ esysContext, sequenceHandle, buffer);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *sequenceHandleNode;
@@ -211,8 +213,10 @@
Esys_SequenceUpdate_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -284,8 +288,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_SetAlgorithmSet.c b/src/tss2-esys/api/Esys_SetAlgorithmSet.c
index f193f0b..b73a384 100644
--- a/src/tss2-esys/api/Esys_SetAlgorithmSet.c
+++ b/src/tss2-esys/api/Esys_SetAlgorithmSet.c
@@ -136,6 +136,8 @@
UINT32 algorithmSet)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, authHandle=%"PRIx32 ", algorithmSet=%"PRIx32 "",
+ esysContext, authHandle, algorithmSet);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authHandleNode;
@@ -205,8 +207,10 @@
Esys_SetAlgorithmSet_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -278,8 +282,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_SetCommandCodeAuditStatus.c b/src/tss2-esys/api/Esys_SetCommandCodeAuditStatus.c
index 75fd2be..0a38dbc 100644
--- a/src/tss2-esys/api/Esys_SetCommandCodeAuditStatus.c
+++ b/src/tss2-esys/api/Esys_SetCommandCodeAuditStatus.c
@@ -162,6 +162,9 @@
const TPML_CC *clearList)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, auth=%"PRIx32 ", auditAlg=%04"PRIx16","
+ "setList=%p, clearList=%p",
+ esysContext, auth, auditAlg, setList, clearList);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authNode;
@@ -235,8 +238,10 @@
Esys_SetCommandCodeAuditStatus_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -310,8 +315,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_SetPrimaryPolicy.c b/src/tss2-esys/api/Esys_SetPrimaryPolicy.c
index cf19e1d..438a0ea 100644
--- a/src/tss2-esys/api/Esys_SetPrimaryPolicy.c
+++ b/src/tss2-esys/api/Esys_SetPrimaryPolicy.c
@@ -149,6 +149,9 @@
TPMI_ALG_HASH hashAlg)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, authHandle=%"PRIx32 ", authPolicy=%p,"
+ "hashAlg=%04"PRIx16"",
+ esysContext, authHandle, authPolicy, hashAlg);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *authHandleNode;
@@ -220,8 +223,10 @@
Esys_SetPrimaryPolicy_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -294,8 +299,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_Shutdown.c b/src/tss2-esys/api/Esys_Shutdown.c
index 8252782..e94bfe3 100644
--- a/src/tss2-esys/api/Esys_Shutdown.c
+++ b/src/tss2-esys/api/Esys_Shutdown.c
@@ -127,6 +127,8 @@
TPM2_SU shutdownType)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, shutdownType=%04"PRIx16"",
+ esysContext, shutdownType);
TSS2L_SYS_AUTH_COMMAND auths;
/* Check context, sequence correctness and set state to error for now */
@@ -189,8 +191,10 @@
Esys_Shutdown_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -261,8 +265,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_Sign.c b/src/tss2-esys/api/Esys_Sign.c
index fec5c2a..e00019c 100644
--- a/src/tss2-esys/api/Esys_Sign.c
+++ b/src/tss2-esys/api/Esys_Sign.c
@@ -172,6 +172,9 @@
const TPMT_TK_HASHCHECK *validation)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, keyHandle=%"PRIx32 ", digest=%p,"
+ "inScheme=%p, validation=%p",
+ esysContext, keyHandle, digest, inScheme, validation);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *keyHandleNode;
@@ -248,8 +251,10 @@
ESYS_CONTEXT *esysContext,
TPMT_SIGNATURE **signature)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, signature=%p",
+ esysContext, signature);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -333,8 +338,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, signature=%p",
- esysContext, signature);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_StartAuthSession.c b/src/tss2-esys/api/Esys_StartAuthSession.c
index db3e64b..3f00551 100644
--- a/src/tss2-esys/api/Esys_StartAuthSession.c
+++ b/src/tss2-esys/api/Esys_StartAuthSession.c
@@ -187,6 +187,11 @@
TPMI_ALG_HASH authHash)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, tpmKey=%"PRIx32 ", bind=%"PRIx32 ","
+ "nonceCaller=%p, sessionType=%02"PRIx8", symmetric=%p,"
+ "authHash=%04"PRIx16"",
+ esysContext, tpmKey, bind, nonceCaller, sessionType,
+ symmetric, authHash);
TPM2B_ENCRYPTED_SECRET encryptedSaltAux = {0};
const TPM2B_ENCRYPTED_SECRET *encryptedSalt = &encryptedSaltAux;
TSS2L_SYS_AUTH_COMMAND auths;
@@ -298,8 +303,10 @@
TPM2B_NONCE **nonceTPM)
{
TPM2B_NONCE *lnonceTPM = NULL;
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, sessionHandle=%p, nonceTPM=%p",
+ esysContext, sessionHandle, nonceTPM);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -467,7 +474,7 @@
secret_size, "ATH",
lnonceTPM, esysContext->in.StartAuthSession.nonceCaller,
authHash_size*8, NULL,
- &sessionHandleNode->rsrc.misc.rsrc_session.sessionKey.buffer[0]);
+ &sessionHandleNode->rsrc.misc.rsrc_session.sessionKey.buffer[0], FALSE);
free(secret);
return_if_error(r, "Error in KDFa computation.");
@@ -486,8 +493,6 @@
SAFE_FREE(lnonceTPM);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, sessionHandle=%p, nonceTPM=%p",
- esysContext, sessionHandle, nonceTPM);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_Startup.c b/src/tss2-esys/api/Esys_Startup.c
index 7c7e07d..938445d 100644
--- a/src/tss2-esys/api/Esys_Startup.c
+++ b/src/tss2-esys/api/Esys_Startup.c
@@ -112,6 +112,8 @@
TPM2_SU startupType)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, startupType=%04"PRIx16"",
+ esysContext, startupType);
/* Check context, sequence correctness and set state to error for now */
if (esysContext == NULL) {
@@ -154,8 +156,10 @@
Esys_Startup_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -212,8 +216,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_StirRandom.c b/src/tss2-esys/api/Esys_StirRandom.c
index cd94b3e..7c90707 100644
--- a/src/tss2-esys/api/Esys_StirRandom.c
+++ b/src/tss2-esys/api/Esys_StirRandom.c
@@ -133,6 +133,8 @@
const TPM2B_SENSITIVE_DATA *inData)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, inData=%p",
+ esysContext, inData);
TSS2L_SYS_AUTH_COMMAND auths;
/* Check context, sequence correctness and set state to error for now */
@@ -195,8 +197,10 @@
Esys_StirRandom_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -267,8 +271,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_TestParms.c b/src/tss2-esys/api/Esys_TestParms.c
index e914139..6a091cd 100644
--- a/src/tss2-esys/api/Esys_TestParms.c
+++ b/src/tss2-esys/api/Esys_TestParms.c
@@ -133,6 +133,8 @@
const TPMT_PUBLIC_PARMS *parameters)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, parameters=%p",
+ esysContext, parameters);
TSS2L_SYS_AUTH_COMMAND auths;
/* Check context, sequence correctness and set state to error for now */
@@ -195,8 +197,10 @@
Esys_TestParms_finish(
ESYS_CONTEXT *esysContext)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p",
+ esysContext);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -267,8 +271,6 @@
return_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" );
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p",
- esysContext);
return TSS2_RC_SUCCESS;
}
diff --git a/src/tss2-esys/api/Esys_Unseal.c b/src/tss2-esys/api/Esys_Unseal.c
index 980d25b..7ffb8bd 100644
--- a/src/tss2-esys/api/Esys_Unseal.c
+++ b/src/tss2-esys/api/Esys_Unseal.c
@@ -133,6 +133,8 @@
ESYS_TR shandle3)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, itemHandle=%"PRIx32 "",
+ esysContext, itemHandle);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *itemHandleNode;
@@ -203,8 +205,10 @@
ESYS_CONTEXT *esysContext,
TPM2B_SENSITIVE_DATA **outData)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, outData=%p",
+ esysContext, outData);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -285,8 +289,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, outData=%p",
- esysContext, outData);
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 be48cc2..643363d 100644
--- a/src/tss2-esys/api/Esys_Vendor_TCG_Test.c
+++ b/src/tss2-esys/api/Esys_Vendor_TCG_Test.c
@@ -137,6 +137,8 @@
const TPM2B_DATA *inputData)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, inputData=%p",
+ esysContext, inputData);
TSS2L_SYS_AUTH_COMMAND auths;
/* Check context, sequence correctness and set state to error for now */
@@ -202,8 +204,10 @@
ESYS_CONTEXT *esysContext,
TPM2B_DATA **outputData)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, outputData=%p",
+ esysContext, outputData);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -284,8 +288,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, outputData=%p",
- esysContext, outputData);
return TSS2_RC_SUCCESS;
diff --git a/src/tss2-esys/api/Esys_VerifySignature.c b/src/tss2-esys/api/Esys_VerifySignature.c
index 94b59f7..24828c5 100644
--- a/src/tss2-esys/api/Esys_VerifySignature.c
+++ b/src/tss2-esys/api/Esys_VerifySignature.c
@@ -159,6 +159,9 @@
const TPMT_SIGNATURE *signature)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, keyHandle=%"PRIx32 ", digest=%p,"
+ "signature=%p",
+ esysContext, keyHandle, digest, signature);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *keyHandleNode;
@@ -232,8 +235,10 @@
ESYS_CONTEXT *esysContext,
TPMT_TK_VERIFIED **validation)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, validation=%p",
+ esysContext, validation);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -316,8 +321,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, validation=%p",
- esysContext, validation);
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 9fe88ef..9068eea 100644
--- a/src/tss2-esys/api/Esys_ZGen_2Phase.c
+++ b/src/tss2-esys/api/Esys_ZGen_2Phase.c
@@ -177,6 +177,10 @@
UINT16 counter)
{
TSS2_RC r;
+ LOG_TRACE("context=%p, keyA=%"PRIx32 ", inQsB=%p,"
+ "inQeB=%p, inScheme=%04"PRIx16", counter=%04"PRIx16"",
+ esysContext, keyA, inQsB, inQeB, inScheme,
+ counter);
TSS2L_SYS_AUTH_COMMAND auths;
RSRC_NODE_T *keyANode;
@@ -258,8 +262,10 @@
TPM2B_ECC_POINT **outZ1,
TPM2B_ECC_POINT **outZ2)
{
- LOG_TRACE("complete");
TSS2_RC r;
+ LOG_TRACE("context=%p, outZ1=%p, outZ2=%p",
+ esysContext, outZ1, outZ2);
+
if (esysContext == NULL) {
LOG_ERROR("esyscontext is NULL.");
return TSS2_ESYS_RC_BAD_REFERENCE;
@@ -351,8 +357,6 @@
goto_state_if_error(r, _ESYS_STATE_INTERNALERROR, "Received error from SAPI"
" unmarshalling" ,error_cleanup);
esysContext->state = _ESYS_STATE_INIT;
- LOG_DEBUG("context=%p, outZ1=%p, outZ2=%p",
- esysContext, outZ1, outZ2);
return TSS2_RC_SUCCESS;