6 changes: 3 additions & 3 deletions tools/tpm2_listpersistent.c
View file
Expand Up @@ -94,7 +94,7 @@ int readPublic(TSS2_SYS_CONTEXT *sapi_context, TPMI_DH_OBJECT objectHandle) {
sessionsDataOut.rspAuths = &sessionDataOutArray[0];
sessionsDataOut.rspAuthsCount = 1;

rval = Tss2_Sys_ReadPublic(sapi_context, objectHandle, 0, &outPublic, &name, &qualifiedName, &sessionsDataOut);
rval = TSS2_RETRY_EXP(Tss2_Sys_ReadPublic(sapi_context, objectHandle, 0, &outPublic, &name, &qualifiedName, &sessionsDataOut));
if(rval != TPM_RC_SUCCESS)
{
LOG_ERR("\nTPM2_ReadPublic error: rval = 0x%0x\n",rval);
Expand Down Expand Up @@ -137,9 +137,9 @@ int tpm2_tool_onrun(TSS2_SYS_CONTEXT *sapi_context, tpm2_option_flags flags) {
UINT32 rval;

UINT32 property = tpm2_util_endian_swap_32(TPM_HT_PERSISTENT);
rval = Tss2_Sys_GetCapability( sapi_context, 0, TPM_CAP_HANDLES,
rval = TSS2_RETRY_EXP(Tss2_Sys_GetCapability(sapi_context, 0, TPM_CAP_HANDLES,
property, TPM_PT_HR_PERSISTENT, &moreData,
&capabilityData, 0 );
&capabilityData, 0));
if(rval != TPM_RC_SUCCESS)
{
LOG_ERR("\n......GetCapability: Get persistent object list Error."
Expand Down
4 changes: 2 additions & 2 deletions tools/tpm2_load.c
View file
Expand Up @@ -95,14 +95,14 @@ int load (TSS2_SYS_CONTEXT *sapi_context) {
sessionsDataOut.rspAuthsCount = 1;
sessionsData.cmdAuthsCount = 1;

rval = Tss2_Sys_Load(sapi_context,
rval = TSS2_RETRY_EXP(Tss2_Sys_Load(sapi_context,
ctx.parent_handle,
&sessionsData,
&ctx.in_private,
&ctx.in_public,
&handle2048rsa,
&nameExt,
&sessionsDataOut);
&sessionsDataOut));
if(rval != TPM_RC_SUCCESS)
{
LOG_ERR("\nLoad Object Failed ! ErrorCode: 0x%0x\n",rval);
Expand Down
4 changes: 2 additions & 2 deletions tools/tpm2_loadexternal.c
View file
Expand Up @@ -101,10 +101,10 @@ static bool load_external(TSS2_SYS_CONTEXT *sapi_context) {
sessionsDataOut.rspAuths = &sessionDataOutArray[0];
sessionsDataOut.rspAuthsCount = 1;

TPM_RC rval = Tss2_Sys_LoadExternal(sapi_context, 0,
TPM_RC rval = TSS2_RETRY_EXP(Tss2_Sys_LoadExternal(sapi_context, 0,
ctx.has_private_key ? &ctx.private_key : NULL, &ctx.public_key,
ctx.hierarchy_value, &ctx.rsa2048_handle, &nameExt,
&sessionsDataOut);
&sessionsDataOut));
if (rval != TPM_RC_SUCCESS) {
LOG_ERR("LoadExternal Failed ! ErrorCode: 0x%0x", rval);
return false;
Expand Down
10 changes: 5 additions & 5 deletions tools/tpm2_makecredential.c
View file
Expand Up @@ -114,22 +114,22 @@ static bool make_credential_and_save(TSS2_SYS_CONTEXT *sapi_context)
sessions_data_out.rspAuths = &session_data_out_array[0];
sessions_data_out.rspAuthsCount = 1;

UINT32 rval = Tss2_Sys_LoadExternal(sapi_context, 0, NULL, &ctx.public,
TPM_RH_NULL, &ctx.rsa2048_handle, &name_ext, &sessions_data_out);
UINT32 rval = TSS2_RETRY_EXP(Tss2_Sys_LoadExternal(sapi_context, 0, NULL, &ctx.public,
TPM_RH_NULL, &ctx.rsa2048_handle, &name_ext, &sessions_data_out));
if (rval != TPM_RC_SUCCESS) {
LOG_ERR("LoadExternal failed. TPM Error:0x%x", rval);
return false;
}

rval = Tss2_Sys_MakeCredential(sapi_context, ctx.rsa2048_handle, 0,
rval = TSS2_RETRY_EXP(Tss2_Sys_MakeCredential(sapi_context, ctx.rsa2048_handle, 0,
&ctx.credential, &ctx.object_name, &cred_blob, &secret,
&sessions_data_out);
&sessions_data_out));
if (rval != TPM_RC_SUCCESS) {
LOG_ERR("MakeCredential failed. TPM Error:0x%x", rval);
return false;
}

rval = Tss2_Sys_FlushContext(sapi_context, ctx.rsa2048_handle);
rval = TSS2_RETRY_EXP(Tss2_Sys_FlushContext(sapi_context, ctx.rsa2048_handle));
if (rval != TPM_RC_SUCCESS) {
LOG_ERR("Flush loaded key failed. TPM Error:0x%x", rval);
return false;
Expand Down
4 changes: 2 additions & 2 deletions tools/tpm2_nvdefine.c
View file
Expand Up @@ -107,8 +107,8 @@ static int nv_space_define(TSS2_SYS_CONTEXT *sapi_context) {

public_info.t.nvPublic.dataSize = ctx.size;

TPM_RC rval = Tss2_Sys_NV_DefineSpace(sapi_context, ctx.authHandle,
&sessions_data, &ctx.nvAuth, &public_info, &sessions_data_out);
TPM_RC rval = TSS2_RETRY_EXP(Tss2_Sys_NV_DefineSpace(sapi_context, ctx.authHandle,
&sessions_data, &ctx.nvAuth, &public_info, &sessions_data_out));
if (rval != TPM_RC_SUCCESS) {
LOG_ERR("Failed to define NV area at index 0x%x (%d).Error:0x%x",
ctx.nvIndex, ctx.nvIndex, rval);
Expand Down
4 changes: 2 additions & 2 deletions tools/tpm2_nvlist.c
View file
Expand Up @@ -69,8 +69,8 @@ static bool nv_list(TSS2_SYS_CONTEXT *sapi_context) {
TPMI_YES_NO moreData;
TPMS_CAPABILITY_DATA capabilityData;
UINT32 property = tpm2_util_endian_swap_32(TPM_HT_NV_INDEX);
TPM_RC rval = Tss2_Sys_GetCapability(sapi_context, 0, TPM_CAP_HANDLES,
property, TPM_PT_NV_INDEX_MAX, &moreData, &capabilityData, 0);
TPM_RC rval = TSS2_RETRY_EXP(Tss2_Sys_GetCapability(sapi_context, 0, TPM_CAP_HANDLES,
property, TPM_PT_NV_INDEX_MAX, &moreData, &capabilityData, 0));
if (rval != TPM_RC_SUCCESS) {
LOG_ERR("GetCapability:Get NV Index list Error. TPM Error:0x%x", rval);
return false;
Expand Down
4 changes: 2 additions & 2 deletions tools/tpm2_nvread.c
View file
Expand Up @@ -148,8 +148,8 @@ static bool nv_read(TSS2_SYS_CONTEXT *sapi_context, tpm2_option_flags flags) {
UINT16 bytes_to_read = ctx.size_to_read > MAX_NV_BUFFER_SIZE ?
MAX_NV_BUFFER_SIZE : ctx.size_to_read;

rval = Tss2_Sys_NV_Read(sapi_context, ctx.auth_handle, ctx.nv_index,
&sessions_data, bytes_to_read, ctx.offset, &nv_data, &sessions_data_out);
rval = TSS2_RETRY_EXP(Tss2_Sys_NV_Read(sapi_context, ctx.auth_handle, ctx.nv_index,
&sessions_data, bytes_to_read, ctx.offset, &nv_data, &sessions_data_out));
if (rval != TPM_RC_SUCCESS) {
LOG_ERR("Failed to read NVRAM area at index 0x%x (%d). Error:0x%x",
ctx.nv_index, ctx.nv_index, rval);
Expand Down
4 changes: 2 additions & 2 deletions tools/tpm2_nvreadlock.c
View file
Expand Up @@ -77,8 +77,8 @@ static bool nv_readlock(TSS2_SYS_CONTEXT *sapi_context) {
sessions_data_out.rspAuthsCount = 1;
sessions_data.cmdAuthsCount = 1;

TPM_RC rval = Tss2_Sys_NV_ReadLock(sapi_context, ctx.auth_handle, ctx.nv_index,
&sessions_data, &sessions_data_out);
TPM_RC rval = TSS2_RETRY_EXP(Tss2_Sys_NV_ReadLock(sapi_context, ctx.auth_handle, ctx.nv_index,
&sessions_data, &sessions_data_out));
if (rval != TPM_RC_SUCCESS) {
LOG_ERR("Failed to lock NVRAM area at index 0x%x (%d).Error:0x%x",
ctx.nv_index, ctx.nv_index, rval);
Expand Down
4 changes: 2 additions & 2 deletions tools/tpm2_nvrelease.c
View file
Expand Up @@ -62,8 +62,8 @@ static bool nv_space_release(TSS2_SYS_CONTEXT *sapi_context) {
sessions_data.cmdAuths = &session_data_array[0];
sessions_data.cmdAuthsCount = 1;

TPM_RC rval = Tss2_Sys_NV_UndefineSpace(sapi_context, ctx.auth_handle,
ctx.nv_index, &sessions_data, 0);
TPM_RC rval = TSS2_RETRY_EXP(Tss2_Sys_NV_UndefineSpace(sapi_context, ctx.auth_handle,
ctx.nv_index, &sessions_data, 0));
if (rval != TPM_RC_SUCCESS) {
LOG_ERR("Failed to release NV area at index 0x%x (%d).Error:0x%x",
ctx.nv_index, ctx.nv_index, rval);
Expand Down
4 changes: 2 additions & 2 deletions tools/tpm2_nvwrite.c
View file
Expand Up @@ -118,9 +118,9 @@ static bool nv_write(TSS2_SYS_CONTEXT *sapi_context) {
}
tpm2_tool_output("\n\n");

TPM_RC rval = Tss2_Sys_NV_Write(sapi_context, ctx.auth_handle,
TPM_RC rval = TSS2_RETRY_EXP(Tss2_Sys_NV_Write(sapi_context, ctx.auth_handle,
ctx.nv_index, &sessions_data, &nv_write_data, ctx.offset + data_offset,
&sessions_data_out);
&sessions_data_out));
if (rval != TSS2_RC_SUCCESS) {
LOG_ERR(
"Failed to write NV area at index 0x%x (%d) offset 0x%x. Error:0x%x",
Expand Down
16 changes: 8 additions & 8 deletions tools/tpm2_pcrevent.c
View file
Expand Up @@ -108,9 +108,9 @@ static TPM_RC tpm_pcrevent_file(TSS2_SYS_CONTEXT *sapi_context,
return TSS2_APP_PCREVENT_RC_FAILED;
}

return Tss2_Sys_PCR_Event(sapi_context, ctx.pcr, &cmd_auth_array,
return TSS2_RETRY_EXP(Tss2_Sys_PCR_Event(sapi_context, ctx.pcr, &cmd_auth_array,
&buffer, result,
NULL);
NULL));
}

TPMI_DH_OBJECT sequence_handle;
Expand All @@ -121,8 +121,8 @@ static TPM_RC tpm_pcrevent_file(TSS2_SYS_CONTEXT *sapi_context,
* to do in a single hash call. Based on the size figure out the chunks
* to loop over, if possible. This way we can call Complete with data.
*/
TPM_RC rval = Tss2_Sys_HashSequenceStart(sapi_context, NULL, &nullAuth,
TPM_ALG_NULL, &sequence_handle, NULL);
TPM_RC rval = TSS2_RETRY_EXP(Tss2_Sys_HashSequenceStart(sapi_context, NULL, &nullAuth,
TPM_ALG_NULL, &sequence_handle, NULL));
if (rval != TPM_RC_SUCCESS) {
LOG_ERR("Tss2_Sys_HashSequenceStart failed: 0x%X", rval);
return rval;
Expand Down Expand Up @@ -156,8 +156,8 @@ static TPM_RC tpm_pcrevent_file(TSS2_SYS_CONTEXT *sapi_context,
data.t.size = bytes_read;

/* if data was read, update the sequence */
rval = Tss2_Sys_SequenceUpdate(sapi_context, sequence_handle,
&cmd_auth_array, &data, NULL);
rval = TSS2_RETRY_EXP(Tss2_Sys_SequenceUpdate(sapi_context, sequence_handle,
&cmd_auth_array, &data, NULL));
if (rval != TPM_RC_SUCCESS) {
LOG_ERR("Tss2_Sys_SequenceUpdate failed: 0x%X", rval);
return rval;
Expand Down Expand Up @@ -193,8 +193,8 @@ static TPM_RC tpm_pcrevent_file(TSS2_SYS_CONTEXT *sapi_context,
swap_auths(all_auths);
cmd_auth_array.cmdAuthsCount = 2;

return Tss2_Sys_EventSequenceComplete(sapi_context, ctx.pcr,
sequence_handle, &cmd_auth_array, &data, result, NULL);
return TSS2_RETRY_EXP(Tss2_Sys_EventSequenceComplete(sapi_context, ctx.pcr,
sequence_handle, &cmd_auth_array, &data, result, NULL));
}

static bool do_hmac_and_output(TSS2_SYS_CONTEXT *sapi_context) {
Expand Down
4 changes: 2 additions & 2 deletions tools/tpm2_pcrextend.c
View file
Expand Up @@ -72,8 +72,8 @@ static bool pcr_extend_one(TSS2_SYS_CONTEXT *sapi_context,
sessions_data.cmdAuthsCount = 1;
sessions_data_out.rspAuthsCount = 1;

TPM_RC rc = Tss2_Sys_PCR_Extend(sapi_context, pcr_index, &sessions_data,
digests, &sessions_data_out);
TPM_RC rc = TSS2_RETRY_EXP(Tss2_Sys_PCR_Extend(sapi_context, pcr_index, &sessions_data,
digests, &sessions_data_out));
if (rc != TPM_RC_SUCCESS) {
LOG_ERR("Could not extend pcr index: 0x%X, due to error: 0x%X",
pcr_index, rc);
Expand Down
8 changes: 4 additions & 4 deletions tools/tpm2_pcrlist.c
View file
Expand Up @@ -148,9 +148,9 @@ static bool read_pcr_values(TSS2_SYS_CONTEXT *sapi_context) {
//2. call pcr_read
ctx.pcrs.count = 0;
do {
UINT32 rval = Tss2_Sys_PCR_Read(sapi_context, no_argument, &pcr_selection_tmp,
UINT32 rval = TSS2_RETRY_EXP(Tss2_Sys_PCR_Read(sapi_context, no_argument, &pcr_selection_tmp,
&pcr_update_counter, &pcr_selection_out,
&ctx.pcrs.pcr_values[ctx.pcrs.count], 0);
&ctx.pcrs.pcr_values[ctx.pcrs.count], 0));

if (rval != TPM_RC_SUCCESS) {
LOG_ERR("read pcr failed. tpm error 0x%0x", rval);
Expand Down Expand Up @@ -350,8 +350,8 @@ static bool get_banks(TSS2_SYS_CONTEXT *sapi_context) {
TPMS_CAPABILITY_DATA *capability_data = &ctx.cap_data;
UINT32 rval;

rval = Tss2_Sys_GetCapability(sapi_context, no_argument, TPM_CAP_PCRS, no_argument, required_argument,
&more_data, capability_data, 0);
rval = TSS2_RETRY_EXP(Tss2_Sys_GetCapability(sapi_context, no_argument, TPM_CAP_PCRS, no_argument, required_argument,
&more_data, capability_data, 0));
if (rval != TPM_RC_SUCCESS) {
LOG_ERR(
"GetCapability: Get PCR allocation status Error. TPM Error:0x%x......",
Expand Down
4 changes: 2 additions & 2 deletions tools/tpm2_quote.c
View file
Expand Up @@ -299,9 +299,9 @@ static int quote(TSS2_SYS_CONTEXT *sapi_context, TPM_HANDLE akHandle, TPML_PCR_S

memset( (void *)&signature, 0, sizeof(signature) );

rval = Tss2_Sys_Quote(sapi_context, akHandle, &sessionsData,
rval = TSS2_RETRY_EXP(Tss2_Sys_Quote(sapi_context, akHandle, &sessionsData,
&qualifyingData, &inScheme, pcrSelection, &quoted,
&signature, &sessionsDataOut );
&signature, &sessionsDataOut));
if(rval != TPM_RC_SUCCESS)
{
printf("\nQuote Failed ! ErrorCode: 0x%0x\n\n", rval);
Expand Down
4 changes: 2 additions & 2 deletions tools/tpm2_readpublic.c
View file
Expand Up @@ -77,8 +77,8 @@ static int read_public_and_save(TSS2_SYS_CONTEXT *sapi_context) {
sessions_out_data.rspAuths = &session_out_data_array[0];
sessions_out_data.rspAuthsCount = ARRAY_LEN(session_out_data_array);

TPM_RC rval = Tss2_Sys_ReadPublic(sapi_context, ctx.objectHandle, 0,
&public, &name, &qualified_name, &sessions_out_data);
TPM_RC rval = TSS2_RETRY_EXP(Tss2_Sys_ReadPublic(sapi_context, ctx.objectHandle, 0,
&public, &name, &qualified_name, &sessions_out_data));
if (rval != TPM_RC_SUCCESS) {
LOG_ERR("TPM2_ReadPublic error: rval = 0x%0x", rval);
return false;
Expand Down
4 changes: 2 additions & 2 deletions tools/tpm2_rsadecrypt.c
View file
Expand Up @@ -85,9 +85,9 @@ static bool rsa_decrypt_and_save(TSS2_SYS_CONTEXT *sapi_context) {
inScheme.scheme = TPM_ALG_RSAES;
label.t.size = 0;

TPM_RC rval = Tss2_Sys_RSA_Decrypt(sapi_context, ctx.key_handle,
TPM_RC rval = TSS2_RETRY_EXP(Tss2_Sys_RSA_Decrypt(sapi_context, ctx.key_handle,
&sessions_data, &ctx.cipher_text, &inScheme, &label, &message,
&sessions_data_out);
&sessions_data_out));
if (rval != TPM_RC_SUCCESS) {
LOG_ERR("rsaDecrypt failed, error code: 0x%x", rval);
return false;
Expand Down
4 changes: 2 additions & 2 deletions tools/tpm2_rsaencrypt.c
View file
Expand Up @@ -77,8 +77,8 @@ static bool rsa_encrypt_and_save(TSS2_SYS_CONTEXT *sapi_context) {
scheme.scheme = TPM_ALG_RSAES;
label.t.size = 0;

TPM_RC rval = Tss2_Sys_RSA_Encrypt(sapi_context, ctx.key_handle, NULL,
&ctx.message, &scheme, &label, &out_data, &out_sessions_data);
TPM_RC rval = TSS2_RETRY_EXP(Tss2_Sys_RSA_Encrypt(sapi_context, ctx.key_handle, NULL,
&ctx.message, &scheme, &label, &out_data, &out_sessions_data));
if (rval != TPM_RC_SUCCESS) {
LOG_ERR("RSA_Encrypt failed, error code: 0x%x", rval);
return false;
Expand Down
4 changes: 2 additions & 2 deletions tools/tpm2_sign.c
View file
Expand Up @@ -110,9 +110,9 @@ static bool sign_and_save(TSS2_SYS_CONTEXT *sapi_context) {
return false;
}

TPM_RC rval = Tss2_Sys_Sign(sapi_context, ctx.keyHandle,
TPM_RC rval = TSS2_RETRY_EXP(Tss2_Sys_Sign(sapi_context, ctx.keyHandle,
&sessions_data, &digest, &in_scheme, &ctx.validation, &signature,
&sessions_data_out);
&sessions_data_out));
if (rval != TPM_RC_SUCCESS) {
LOG_ERR("Sys_Sign failed, error code: 0x%x", rval);
return false;
Expand Down
2 changes: 1 addition & 1 deletion tools/tpm2_startup.c
View file
Expand Up @@ -85,7 +85,7 @@ int tpm2_tool_onrun(TSS2_SYS_CONTEXT *sapi_context, tpm2_option_flags flags) {
LOG_INFO ("Sending TPM_Startup command with type: %s",
ctx.clear ? "TPM_SU_CLEAR" : "TPM_SU_STATE");

TPM_RC rc = Tss2_Sys_Startup (sapi_context, startup_type);
TPM_RC rc = TSS2_RETRY_EXP(Tss2_Sys_Startup (sapi_context, startup_type));
if (rc != TSS2_RC_SUCCESS && rc != TPM_RC_INITIALIZE) {
LOG_ERR ("Tss2_Sys_Startup failed: 0x%x",
rc);
Expand Down
6 changes: 3 additions & 3 deletions tools/tpm2_takeownership.c
View file
Expand Up @@ -80,7 +80,7 @@ static bool clear_hierarchy_auth(TSS2_SYS_CONTEXT *sapi_context) {

memcpy(&sessionData.hmac, &ctx.passwords.lockout.old, sizeof(ctx.passwords.lockout.old));

TPM_RC rval = Tss2_Sys_Clear(sapi_context, TPM_RH_LOCKOUT, &sessionsData, 0);
TPM_RC rval = TSS2_RETRY_EXP(Tss2_Sys_Clear(sapi_context, TPM_RH_LOCKOUT, &sessionsData, 0));
if (rval != TPM_RC_SUCCESS) {
LOG_ERR("Clearing Failed! TPM error code: 0x%0x", rval);
return false;
Expand Down Expand Up @@ -110,8 +110,8 @@ static bool change_auth(TSS2_SYS_CONTEXT *sapi_context,
memcpy(&newAuth, &pwd->new, sizeof(pwd->new));
memcpy(&sessionData.hmac, &pwd->old, sizeof(pwd->old));

UINT32 rval = Tss2_Sys_HierarchyChangeAuth(sapi_context,
auth_handle, &sessionsData, &newAuth, 0);
UINT32 rval = TSS2_RETRY_EXP(Tss2_Sys_HierarchyChangeAuth(sapi_context,
auth_handle, &sessionsData, &newAuth, 0));
if (rval != TPM_RC_SUCCESS) {
LOG_ERR("Could not change hierarchy for %s. TPM Error:0x%x",
desc, rval);
Expand Down
8 changes: 4 additions & 4 deletions tools/tpm2_unseal.c
View file
Expand Up @@ -87,8 +87,8 @@ bool unseal_and_save(TSS2_SYS_CONTEXT *sapi_context) {
sessions_data_out.rspAuthsCount = 1;
sessions_data.cmdAuthsCount = 1;

TPM_RC rval = Tss2_Sys_Unseal(sapi_context, ctx.itemHandle,
&sessions_data, &outData, &sessions_data_out);
TPM_RC rval = TSS2_RETRY_EXP(Tss2_Sys_Unseal(sapi_context, ctx.itemHandle,
&sessions_data, &outData, &sessions_data_out));
if (rval != TPM_RC_SUCCESS) {
LOG_ERR("Sys_Unseal failed. Error Code: 0x%x", rval);
return false;
Expand Down Expand Up @@ -226,8 +226,8 @@ int tpm2_tool_onrun(TSS2_SYS_CONTEXT *sapi_context, tpm2_option_flags flags) {
}

if (ctx.policy_session) {
TPM_RC rval = Tss2_Sys_FlushContext(sapi_context,
ctx.policy_session->sessionHandle);
TPM_RC rval = TSS2_RETRY_EXP(Tss2_Sys_FlushContext(sapi_context,
ctx.policy_session->sessionHandle));
if (rval != TPM_RC_SUCCESS) {
LOG_ERR("Failed Flush Context: 0x%x", rval);
return 1;
Expand Down
4 changes: 2 additions & 2 deletions tools/tpm2_verifysignature.c
View file
Expand Up @@ -93,8 +93,8 @@ static bool verify_signature(TSS2_SYS_CONTEXT *sapi_context) {
}
tpm2_tool_output("\n");

rval = Tss2_Sys_VerifySignature(sapi_context, ctx.keyHandle, NULL,
&ctx.msgHash, &ctx.signature, &validation, &sessionsDataOut);
rval = TSS2_RETRY_EXP(Tss2_Sys_VerifySignature(sapi_context, ctx.keyHandle, NULL,
&ctx.msgHash, &ctx.signature, &validation, &sessionsDataOut));
if (rval != TPM_RC_SUCCESS) {
LOG_ERR("Tss2_Sys_VerifySignature failed, error code: 0x%x", rval);
return false;
Expand Down