util: Move several auxiliary macros from esys module to utilities.
* The macros will also be used in the FAPI implementation. Thus they were removed
from the esys package.
* The macros could also be used in the sys module to improve logging.
Signed-off-by: Juergen Repp <Juergen.Repp@sit.fraunhofer.de>
diff --git a/src/tss2-esys/api/Esys_ActivateCredential.c b/src/tss2-esys/api/Esys_ActivateCredential.c
index 18d40ba..56e91d5 100644
--- a/src/tss2-esys/api/Esys_ActivateCredential.c
+++ b/src/tss2-esys/api/Esys_ActivateCredential.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_Certify.c b/src/tss2-esys/api/Esys_Certify.c
index d905fd2..5bcf91f 100644
--- a/src/tss2-esys/api/Esys_Certify.c
+++ b/src/tss2-esys/api/Esys_Certify.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_CertifyCreation.c b/src/tss2-esys/api/Esys_CertifyCreation.c
index 1112f9a..affba86 100644
--- a/src/tss2-esys/api/Esys_CertifyCreation.c
+++ b/src/tss2-esys/api/Esys_CertifyCreation.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_ChangeEPS.c b/src/tss2-esys/api/Esys_ChangeEPS.c
index 3f1c7f8..9a5f361 100644
--- a/src/tss2-esys/api/Esys_ChangeEPS.c
+++ b/src/tss2-esys/api/Esys_ChangeEPS.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_ChangePPS.c b/src/tss2-esys/api/Esys_ChangePPS.c
index 78912a3..d351225 100644
--- a/src/tss2-esys/api/Esys_ChangePPS.c
+++ b/src/tss2-esys/api/Esys_ChangePPS.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_Clear.c b/src/tss2-esys/api/Esys_Clear.c
index eec871c..2078bc9 100644
--- a/src/tss2-esys/api/Esys_Clear.c
+++ b/src/tss2-esys/api/Esys_Clear.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_ClearControl.c b/src/tss2-esys/api/Esys_ClearControl.c
index 30f218c..c41f9a6 100644
--- a/src/tss2-esys/api/Esys_ClearControl.c
+++ b/src/tss2-esys/api/Esys_ClearControl.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_ClockRateAdjust.c b/src/tss2-esys/api/Esys_ClockRateAdjust.c
index 54ae772..c280e8d 100644
--- a/src/tss2-esys/api/Esys_ClockRateAdjust.c
+++ b/src/tss2-esys/api/Esys_ClockRateAdjust.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_ClockSet.c b/src/tss2-esys/api/Esys_ClockSet.c
index 760a168..5afa7e9 100644
--- a/src/tss2-esys/api/Esys_ClockSet.c
+++ b/src/tss2-esys/api/Esys_ClockSet.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_Commit.c b/src/tss2-esys/api/Esys_Commit.c
index aa13d93..5450925 100644
--- a/src/tss2-esys/api/Esys_Commit.c
+++ b/src/tss2-esys/api/Esys_Commit.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_ContextLoad.c b/src/tss2-esys/api/Esys_ContextLoad.c
index 7db7804..ddbfd14 100644
--- a/src/tss2-esys/api/Esys_ContextLoad.c
+++ b/src/tss2-esys/api/Esys_ContextLoad.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_ContextSave.c b/src/tss2-esys/api/Esys_ContextSave.c
index 4c8b4c9..ab203ad 100644
--- a/src/tss2-esys/api/Esys_ContextSave.c
+++ b/src/tss2-esys/api/Esys_ContextSave.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_Create.c b/src/tss2-esys/api/Esys_Create.c
index 97e54e3..21b249c 100644
--- a/src/tss2-esys/api/Esys_Create.c
+++ b/src/tss2-esys/api/Esys_Create.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_CreateLoaded.c b/src/tss2-esys/api/Esys_CreateLoaded.c
index 9f2822e..f469c98 100644
--- a/src/tss2-esys/api/Esys_CreateLoaded.c
+++ b/src/tss2-esys/api/Esys_CreateLoaded.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_CreatePrimary.c b/src/tss2-esys/api/Esys_CreatePrimary.c
index 71e7ecf..cad4c29 100644
--- a/src/tss2-esys/api/Esys_CreatePrimary.c
+++ b/src/tss2-esys/api/Esys_CreatePrimary.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_DictionaryAttackLockReset.c b/src/tss2-esys/api/Esys_DictionaryAttackLockReset.c
index 300cd3d..c22c96e 100644
--- a/src/tss2-esys/api/Esys_DictionaryAttackLockReset.c
+++ b/src/tss2-esys/api/Esys_DictionaryAttackLockReset.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_DictionaryAttackParameters.c b/src/tss2-esys/api/Esys_DictionaryAttackParameters.c
index 8e13a7c..2fbac05 100644
--- a/src/tss2-esys/api/Esys_DictionaryAttackParameters.c
+++ b/src/tss2-esys/api/Esys_DictionaryAttackParameters.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_Duplicate.c b/src/tss2-esys/api/Esys_Duplicate.c
index 2e7b00a..57f34bf 100644
--- a/src/tss2-esys/api/Esys_Duplicate.c
+++ b/src/tss2-esys/api/Esys_Duplicate.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_ECC_Parameters.c b/src/tss2-esys/api/Esys_ECC_Parameters.c
index ffc2b2c..aceae75 100644
--- a/src/tss2-esys/api/Esys_ECC_Parameters.c
+++ b/src/tss2-esys/api/Esys_ECC_Parameters.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_ECDH_KeyGen.c b/src/tss2-esys/api/Esys_ECDH_KeyGen.c
index ff7f77e..014206b 100644
--- a/src/tss2-esys/api/Esys_ECDH_KeyGen.c
+++ b/src/tss2-esys/api/Esys_ECDH_KeyGen.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_ECDH_ZGen.c b/src/tss2-esys/api/Esys_ECDH_ZGen.c
index fb3726f..e1ab9bf 100644
--- a/src/tss2-esys/api/Esys_ECDH_ZGen.c
+++ b/src/tss2-esys/api/Esys_ECDH_ZGen.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_EC_Ephemeral.c b/src/tss2-esys/api/Esys_EC_Ephemeral.c
index f3f0703..a7a004c 100644
--- a/src/tss2-esys/api/Esys_EC_Ephemeral.c
+++ b/src/tss2-esys/api/Esys_EC_Ephemeral.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_EncryptDecrypt.c b/src/tss2-esys/api/Esys_EncryptDecrypt.c
index 11db023..eb731fe 100644
--- a/src/tss2-esys/api/Esys_EncryptDecrypt.c
+++ b/src/tss2-esys/api/Esys_EncryptDecrypt.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_EncryptDecrypt2.c b/src/tss2-esys/api/Esys_EncryptDecrypt2.c
index fd57e74..ef3b0a1 100644
--- a/src/tss2-esys/api/Esys_EncryptDecrypt2.c
+++ b/src/tss2-esys/api/Esys_EncryptDecrypt2.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_EventSequenceComplete.c b/src/tss2-esys/api/Esys_EventSequenceComplete.c
index f7e25b6..6b0660d 100644
--- a/src/tss2-esys/api/Esys_EventSequenceComplete.c
+++ b/src/tss2-esys/api/Esys_EventSequenceComplete.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_EvictControl.c b/src/tss2-esys/api/Esys_EvictControl.c
index 1df7be6..6f583b8 100644
--- a/src/tss2-esys/api/Esys_EvictControl.c
+++ b/src/tss2-esys/api/Esys_EvictControl.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_FieldUpgradeData.c b/src/tss2-esys/api/Esys_FieldUpgradeData.c
index 2b0d090..298763f 100644
--- a/src/tss2-esys/api/Esys_FieldUpgradeData.c
+++ b/src/tss2-esys/api/Esys_FieldUpgradeData.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_FieldUpgradeStart.c b/src/tss2-esys/api/Esys_FieldUpgradeStart.c
index f9acf09..5b0477f 100644
--- a/src/tss2-esys/api/Esys_FieldUpgradeStart.c
+++ b/src/tss2-esys/api/Esys_FieldUpgradeStart.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_FirmwareRead.c b/src/tss2-esys/api/Esys_FirmwareRead.c
index d3fa3eb..8c34efb 100644
--- a/src/tss2-esys/api/Esys_FirmwareRead.c
+++ b/src/tss2-esys/api/Esys_FirmwareRead.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_FlushContext.c b/src/tss2-esys/api/Esys_FlushContext.c
index 0b3cdfc..e9a2a6e 100644
--- a/src/tss2-esys/api/Esys_FlushContext.c
+++ b/src/tss2-esys/api/Esys_FlushContext.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_GetCapability.c b/src/tss2-esys/api/Esys_GetCapability.c
index b7d902a..5241504 100644
--- a/src/tss2-esys/api/Esys_GetCapability.c
+++ b/src/tss2-esys/api/Esys_GetCapability.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_GetCommandAuditDigest.c b/src/tss2-esys/api/Esys_GetCommandAuditDigest.c
index 98c0285..0792cc9 100644
--- a/src/tss2-esys/api/Esys_GetCommandAuditDigest.c
+++ b/src/tss2-esys/api/Esys_GetCommandAuditDigest.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_GetRandom.c b/src/tss2-esys/api/Esys_GetRandom.c
index 703a3c2..cb4a212 100644
--- a/src/tss2-esys/api/Esys_GetRandom.c
+++ b/src/tss2-esys/api/Esys_GetRandom.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_GetSessionAuditDigest.c b/src/tss2-esys/api/Esys_GetSessionAuditDigest.c
index be745c4..138b6f4 100644
--- a/src/tss2-esys/api/Esys_GetSessionAuditDigest.c
+++ b/src/tss2-esys/api/Esys_GetSessionAuditDigest.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_GetTestResult.c b/src/tss2-esys/api/Esys_GetTestResult.c
index 9c38323..de57da0 100644
--- a/src/tss2-esys/api/Esys_GetTestResult.c
+++ b/src/tss2-esys/api/Esys_GetTestResult.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
/** One-Call function for TPM2_GetTestResult
diff --git a/src/tss2-esys/api/Esys_GetTime.c b/src/tss2-esys/api/Esys_GetTime.c
index 5bd934e..d460a3e 100644
--- a/src/tss2-esys/api/Esys_GetTime.c
+++ b/src/tss2-esys/api/Esys_GetTime.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_HMAC.c b/src/tss2-esys/api/Esys_HMAC.c
index 203f017..e64e6f0 100644
--- a/src/tss2-esys/api/Esys_HMAC.c
+++ b/src/tss2-esys/api/Esys_HMAC.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_HMAC_Start.c b/src/tss2-esys/api/Esys_HMAC_Start.c
index f38cef0..b4aecde 100644
--- a/src/tss2-esys/api/Esys_HMAC_Start.c
+++ b/src/tss2-esys/api/Esys_HMAC_Start.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_Hash.c b/src/tss2-esys/api/Esys_Hash.c
index 6170334..a20315b 100644
--- a/src/tss2-esys/api/Esys_Hash.c
+++ b/src/tss2-esys/api/Esys_Hash.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_HashSequenceStart.c b/src/tss2-esys/api/Esys_HashSequenceStart.c
index 0fd125d..aa49ab6 100644
--- a/src/tss2-esys/api/Esys_HashSequenceStart.c
+++ b/src/tss2-esys/api/Esys_HashSequenceStart.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_HierarchyChangeAuth.c b/src/tss2-esys/api/Esys_HierarchyChangeAuth.c
index 254a86d..d1e6ac3 100644
--- a/src/tss2-esys/api/Esys_HierarchyChangeAuth.c
+++ b/src/tss2-esys/api/Esys_HierarchyChangeAuth.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_HierarchyControl.c b/src/tss2-esys/api/Esys_HierarchyControl.c
index a8703ba..ec94e2a 100644
--- a/src/tss2-esys/api/Esys_HierarchyControl.c
+++ b/src/tss2-esys/api/Esys_HierarchyControl.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_Import.c b/src/tss2-esys/api/Esys_Import.c
index 01108fe..2e1bb52 100644
--- a/src/tss2-esys/api/Esys_Import.c
+++ b/src/tss2-esys/api/Esys_Import.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_IncrementalSelfTest.c b/src/tss2-esys/api/Esys_IncrementalSelfTest.c
index f57fd15..6492f41 100644
--- a/src/tss2-esys/api/Esys_IncrementalSelfTest.c
+++ b/src/tss2-esys/api/Esys_IncrementalSelfTest.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_Load.c b/src/tss2-esys/api/Esys_Load.c
index c9f4270..26665d4 100644
--- a/src/tss2-esys/api/Esys_Load.c
+++ b/src/tss2-esys/api/Esys_Load.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_LoadExternal.c b/src/tss2-esys/api/Esys_LoadExternal.c
index f25ae5d..41eba79 100644
--- a/src/tss2-esys/api/Esys_LoadExternal.c
+++ b/src/tss2-esys/api/Esys_LoadExternal.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_MakeCredential.c b/src/tss2-esys/api/Esys_MakeCredential.c
index 53d8c68..aa05f91 100644
--- a/src/tss2-esys/api/Esys_MakeCredential.c
+++ b/src/tss2-esys/api/Esys_MakeCredential.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_NV_Certify.c b/src/tss2-esys/api/Esys_NV_Certify.c
index fcd5816..c08d8fa 100644
--- a/src/tss2-esys/api/Esys_NV_Certify.c
+++ b/src/tss2-esys/api/Esys_NV_Certify.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_NV_ChangeAuth.c b/src/tss2-esys/api/Esys_NV_ChangeAuth.c
index e70b9a1..d23e24c 100644
--- a/src/tss2-esys/api/Esys_NV_ChangeAuth.c
+++ b/src/tss2-esys/api/Esys_NV_ChangeAuth.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_NV_DefineSpace.c b/src/tss2-esys/api/Esys_NV_DefineSpace.c
index d9251b1..47cf43f 100644
--- a/src/tss2-esys/api/Esys_NV_DefineSpace.c
+++ b/src/tss2-esys/api/Esys_NV_DefineSpace.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_NV_Extend.c b/src/tss2-esys/api/Esys_NV_Extend.c
index 8d185f3..0a07b4e 100644
--- a/src/tss2-esys/api/Esys_NV_Extend.c
+++ b/src/tss2-esys/api/Esys_NV_Extend.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_NV_GlobalWriteLock.c b/src/tss2-esys/api/Esys_NV_GlobalWriteLock.c
index 5108ac5..73a726c 100644
--- a/src/tss2-esys/api/Esys_NV_GlobalWriteLock.c
+++ b/src/tss2-esys/api/Esys_NV_GlobalWriteLock.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_NV_Increment.c b/src/tss2-esys/api/Esys_NV_Increment.c
index 41bff51..bb217b9 100644
--- a/src/tss2-esys/api/Esys_NV_Increment.c
+++ b/src/tss2-esys/api/Esys_NV_Increment.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_NV_Read.c b/src/tss2-esys/api/Esys_NV_Read.c
index bf92b47..d18a895 100644
--- a/src/tss2-esys/api/Esys_NV_Read.c
+++ b/src/tss2-esys/api/Esys_NV_Read.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_NV_ReadLock.c b/src/tss2-esys/api/Esys_NV_ReadLock.c
index ca424b9..9debeff 100644
--- a/src/tss2-esys/api/Esys_NV_ReadLock.c
+++ b/src/tss2-esys/api/Esys_NV_ReadLock.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_NV_ReadPublic.c b/src/tss2-esys/api/Esys_NV_ReadPublic.c
index 0eb0ff3..6d8717c 100644
--- a/src/tss2-esys/api/Esys_NV_ReadPublic.c
+++ b/src/tss2-esys/api/Esys_NV_ReadPublic.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_NV_SetBits.c b/src/tss2-esys/api/Esys_NV_SetBits.c
index bf4a0bf..1bfc3e5 100644
--- a/src/tss2-esys/api/Esys_NV_SetBits.c
+++ b/src/tss2-esys/api/Esys_NV_SetBits.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_NV_UndefineSpace.c b/src/tss2-esys/api/Esys_NV_UndefineSpace.c
index 9ed482e..967c387 100644
--- a/src/tss2-esys/api/Esys_NV_UndefineSpace.c
+++ b/src/tss2-esys/api/Esys_NV_UndefineSpace.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_NV_UndefineSpaceSpecial.c b/src/tss2-esys/api/Esys_NV_UndefineSpaceSpecial.c
index 9202480..93aca11 100644
--- a/src/tss2-esys/api/Esys_NV_UndefineSpaceSpecial.c
+++ b/src/tss2-esys/api/Esys_NV_UndefineSpaceSpecial.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_NV_Write.c b/src/tss2-esys/api/Esys_NV_Write.c
index 08f0d73..6f7081c 100644
--- a/src/tss2-esys/api/Esys_NV_Write.c
+++ b/src/tss2-esys/api/Esys_NV_Write.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_NV_WriteLock.c b/src/tss2-esys/api/Esys_NV_WriteLock.c
index c6b79b9..b897638 100644
--- a/src/tss2-esys/api/Esys_NV_WriteLock.c
+++ b/src/tss2-esys/api/Esys_NV_WriteLock.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_ObjectChangeAuth.c b/src/tss2-esys/api/Esys_ObjectChangeAuth.c
index 6083fe8..68f8a08 100644
--- a/src/tss2-esys/api/Esys_ObjectChangeAuth.c
+++ b/src/tss2-esys/api/Esys_ObjectChangeAuth.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PCR_Allocate.c b/src/tss2-esys/api/Esys_PCR_Allocate.c
index c8b9e6a..16ad0d5 100644
--- a/src/tss2-esys/api/Esys_PCR_Allocate.c
+++ b/src/tss2-esys/api/Esys_PCR_Allocate.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PCR_Event.c b/src/tss2-esys/api/Esys_PCR_Event.c
index eb8c55a..05142a1 100644
--- a/src/tss2-esys/api/Esys_PCR_Event.c
+++ b/src/tss2-esys/api/Esys_PCR_Event.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PCR_Extend.c b/src/tss2-esys/api/Esys_PCR_Extend.c
index 75b2da7..41613d5 100644
--- a/src/tss2-esys/api/Esys_PCR_Extend.c
+++ b/src/tss2-esys/api/Esys_PCR_Extend.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PCR_Read.c b/src/tss2-esys/api/Esys_PCR_Read.c
index a2aed8f..ac49e67 100644
--- a/src/tss2-esys/api/Esys_PCR_Read.c
+++ b/src/tss2-esys/api/Esys_PCR_Read.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PCR_Reset.c b/src/tss2-esys/api/Esys_PCR_Reset.c
index 6106b48..2c3b678 100644
--- a/src/tss2-esys/api/Esys_PCR_Reset.c
+++ b/src/tss2-esys/api/Esys_PCR_Reset.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PCR_SetAuthPolicy.c b/src/tss2-esys/api/Esys_PCR_SetAuthPolicy.c
index 6f92a07..7a95077 100644
--- a/src/tss2-esys/api/Esys_PCR_SetAuthPolicy.c
+++ b/src/tss2-esys/api/Esys_PCR_SetAuthPolicy.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PCR_SetAuthValue.c b/src/tss2-esys/api/Esys_PCR_SetAuthValue.c
index 6bec204..a9e982f 100644
--- a/src/tss2-esys/api/Esys_PCR_SetAuthValue.c
+++ b/src/tss2-esys/api/Esys_PCR_SetAuthValue.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PP_Commands.c b/src/tss2-esys/api/Esys_PP_Commands.c
index 47c5c51..4ef933a 100644
--- a/src/tss2-esys/api/Esys_PP_Commands.c
+++ b/src/tss2-esys/api/Esys_PP_Commands.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PolicyAuthValue.c b/src/tss2-esys/api/Esys_PolicyAuthValue.c
index 9a7fcae..0d45a96 100644
--- a/src/tss2-esys/api/Esys_PolicyAuthValue.c
+++ b/src/tss2-esys/api/Esys_PolicyAuthValue.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PolicyAuthorize.c b/src/tss2-esys/api/Esys_PolicyAuthorize.c
index f112f1e..95d546e 100644
--- a/src/tss2-esys/api/Esys_PolicyAuthorize.c
+++ b/src/tss2-esys/api/Esys_PolicyAuthorize.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PolicyAuthorizeNV.c b/src/tss2-esys/api/Esys_PolicyAuthorizeNV.c
index 193e821..2f500d1 100644
--- a/src/tss2-esys/api/Esys_PolicyAuthorizeNV.c
+++ b/src/tss2-esys/api/Esys_PolicyAuthorizeNV.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PolicyCommandCode.c b/src/tss2-esys/api/Esys_PolicyCommandCode.c
index 2cdc2f9..f88e73a 100644
--- a/src/tss2-esys/api/Esys_PolicyCommandCode.c
+++ b/src/tss2-esys/api/Esys_PolicyCommandCode.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PolicyCounterTimer.c b/src/tss2-esys/api/Esys_PolicyCounterTimer.c
index 8d9e853..45ce2d3 100644
--- a/src/tss2-esys/api/Esys_PolicyCounterTimer.c
+++ b/src/tss2-esys/api/Esys_PolicyCounterTimer.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PolicyCpHash.c b/src/tss2-esys/api/Esys_PolicyCpHash.c
index 1c78871..5837e18 100644
--- a/src/tss2-esys/api/Esys_PolicyCpHash.c
+++ b/src/tss2-esys/api/Esys_PolicyCpHash.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PolicyDuplicationSelect.c b/src/tss2-esys/api/Esys_PolicyDuplicationSelect.c
index 72e40bd..076213c 100644
--- a/src/tss2-esys/api/Esys_PolicyDuplicationSelect.c
+++ b/src/tss2-esys/api/Esys_PolicyDuplicationSelect.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PolicyGetDigest.c b/src/tss2-esys/api/Esys_PolicyGetDigest.c
index 148e6d8..d085fd6 100644
--- a/src/tss2-esys/api/Esys_PolicyGetDigest.c
+++ b/src/tss2-esys/api/Esys_PolicyGetDigest.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PolicyLocality.c b/src/tss2-esys/api/Esys_PolicyLocality.c
index 3cde902..7101fcb 100644
--- a/src/tss2-esys/api/Esys_PolicyLocality.c
+++ b/src/tss2-esys/api/Esys_PolicyLocality.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PolicyNV.c b/src/tss2-esys/api/Esys_PolicyNV.c
index 22d427a..a89575f 100644
--- a/src/tss2-esys/api/Esys_PolicyNV.c
+++ b/src/tss2-esys/api/Esys_PolicyNV.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PolicyNameHash.c b/src/tss2-esys/api/Esys_PolicyNameHash.c
index e51149d..3f52935 100644
--- a/src/tss2-esys/api/Esys_PolicyNameHash.c
+++ b/src/tss2-esys/api/Esys_PolicyNameHash.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PolicyNvWritten.c b/src/tss2-esys/api/Esys_PolicyNvWritten.c
index 2a61d09..ca11a8c 100644
--- a/src/tss2-esys/api/Esys_PolicyNvWritten.c
+++ b/src/tss2-esys/api/Esys_PolicyNvWritten.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PolicyOR.c b/src/tss2-esys/api/Esys_PolicyOR.c
index cfa4ea2..118b161 100644
--- a/src/tss2-esys/api/Esys_PolicyOR.c
+++ b/src/tss2-esys/api/Esys_PolicyOR.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PolicyPCR.c b/src/tss2-esys/api/Esys_PolicyPCR.c
index 661b5e5..c5e9603 100644
--- a/src/tss2-esys/api/Esys_PolicyPCR.c
+++ b/src/tss2-esys/api/Esys_PolicyPCR.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PolicyPassword.c b/src/tss2-esys/api/Esys_PolicyPassword.c
index 55ac1d1..7763160 100644
--- a/src/tss2-esys/api/Esys_PolicyPassword.c
+++ b/src/tss2-esys/api/Esys_PolicyPassword.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PolicyPhysicalPresence.c b/src/tss2-esys/api/Esys_PolicyPhysicalPresence.c
index 9e338c7..dac8233 100644
--- a/src/tss2-esys/api/Esys_PolicyPhysicalPresence.c
+++ b/src/tss2-esys/api/Esys_PolicyPhysicalPresence.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PolicyRestart.c b/src/tss2-esys/api/Esys_PolicyRestart.c
index 7f57489..3f68169 100644
--- a/src/tss2-esys/api/Esys_PolicyRestart.c
+++ b/src/tss2-esys/api/Esys_PolicyRestart.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PolicySecret.c b/src/tss2-esys/api/Esys_PolicySecret.c
index e2d0717..149dfe0 100644
--- a/src/tss2-esys/api/Esys_PolicySecret.c
+++ b/src/tss2-esys/api/Esys_PolicySecret.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PolicySigned.c b/src/tss2-esys/api/Esys_PolicySigned.c
index 6405100..bc54e2b 100644
--- a/src/tss2-esys/api/Esys_PolicySigned.c
+++ b/src/tss2-esys/api/Esys_PolicySigned.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PolicyTemplate.c b/src/tss2-esys/api/Esys_PolicyTemplate.c
index 8fe87ee..9345ebe 100644
--- a/src/tss2-esys/api/Esys_PolicyTemplate.c
+++ b/src/tss2-esys/api/Esys_PolicyTemplate.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_PolicyTicket.c b/src/tss2-esys/api/Esys_PolicyTicket.c
index b33d69b..7d7b1d0 100644
--- a/src/tss2-esys/api/Esys_PolicyTicket.c
+++ b/src/tss2-esys/api/Esys_PolicyTicket.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_Quote.c b/src/tss2-esys/api/Esys_Quote.c
index f46e3c0..b2ecdeb 100644
--- a/src/tss2-esys/api/Esys_Quote.c
+++ b/src/tss2-esys/api/Esys_Quote.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_RSA_Decrypt.c b/src/tss2-esys/api/Esys_RSA_Decrypt.c
index d9a1300..40396b2 100644
--- a/src/tss2-esys/api/Esys_RSA_Decrypt.c
+++ b/src/tss2-esys/api/Esys_RSA_Decrypt.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_RSA_Encrypt.c b/src/tss2-esys/api/Esys_RSA_Encrypt.c
index 8fcb9e8..a4b0197 100644
--- a/src/tss2-esys/api/Esys_RSA_Encrypt.c
+++ b/src/tss2-esys/api/Esys_RSA_Encrypt.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_ReadClock.c b/src/tss2-esys/api/Esys_ReadClock.c
index 485192b..1dc9806 100644
--- a/src/tss2-esys/api/Esys_ReadClock.c
+++ b/src/tss2-esys/api/Esys_ReadClock.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
/** One-Call function for TPM2_ReadClock
diff --git a/src/tss2-esys/api/Esys_ReadPublic.c b/src/tss2-esys/api/Esys_ReadPublic.c
index 4e9ac8c..e7f2160 100644
--- a/src/tss2-esys/api/Esys_ReadPublic.c
+++ b/src/tss2-esys/api/Esys_ReadPublic.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_Rewrap.c b/src/tss2-esys/api/Esys_Rewrap.c
index 0b455e6..c3ce9f1 100644
--- a/src/tss2-esys/api/Esys_Rewrap.c
+++ b/src/tss2-esys/api/Esys_Rewrap.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_SelfTest.c b/src/tss2-esys/api/Esys_SelfTest.c
index 18e3899..b88fd1e 100644
--- a/src/tss2-esys/api/Esys_SelfTest.c
+++ b/src/tss2-esys/api/Esys_SelfTest.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_SequenceComplete.c b/src/tss2-esys/api/Esys_SequenceComplete.c
index 4a5a0f4..f4d9e19 100644
--- a/src/tss2-esys/api/Esys_SequenceComplete.c
+++ b/src/tss2-esys/api/Esys_SequenceComplete.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_SequenceUpdate.c b/src/tss2-esys/api/Esys_SequenceUpdate.c
index c3f72dc..10c2df6 100644
--- a/src/tss2-esys/api/Esys_SequenceUpdate.c
+++ b/src/tss2-esys/api/Esys_SequenceUpdate.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_SetAlgorithmSet.c b/src/tss2-esys/api/Esys_SetAlgorithmSet.c
index d7167e2..d44f41d 100644
--- a/src/tss2-esys/api/Esys_SetAlgorithmSet.c
+++ b/src/tss2-esys/api/Esys_SetAlgorithmSet.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_SetCommandCodeAuditStatus.c b/src/tss2-esys/api/Esys_SetCommandCodeAuditStatus.c
index 95626ca..a24a9f9 100644
--- a/src/tss2-esys/api/Esys_SetCommandCodeAuditStatus.c
+++ b/src/tss2-esys/api/Esys_SetCommandCodeAuditStatus.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_SetPrimaryPolicy.c b/src/tss2-esys/api/Esys_SetPrimaryPolicy.c
index b7dd660..2da75fa 100644
--- a/src/tss2-esys/api/Esys_SetPrimaryPolicy.c
+++ b/src/tss2-esys/api/Esys_SetPrimaryPolicy.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_Shutdown.c b/src/tss2-esys/api/Esys_Shutdown.c
index f9e5894..e2bf1af 100644
--- a/src/tss2-esys/api/Esys_Shutdown.c
+++ b/src/tss2-esys/api/Esys_Shutdown.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_Sign.c b/src/tss2-esys/api/Esys_Sign.c
index a445d32..19c4464 100644
--- a/src/tss2-esys/api/Esys_Sign.c
+++ b/src/tss2-esys/api/Esys_Sign.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_StartAuthSession.c b/src/tss2-esys/api/Esys_StartAuthSession.c
index 5bdb81a..6ea60c4 100644
--- a/src/tss2-esys/api/Esys_StartAuthSession.c
+++ b/src/tss2-esys/api/Esys_StartAuthSession.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_Startup.c b/src/tss2-esys/api/Esys_Startup.c
index fdda44a..58785b9 100644
--- a/src/tss2-esys/api/Esys_Startup.c
+++ b/src/tss2-esys/api/Esys_Startup.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_StirRandom.c b/src/tss2-esys/api/Esys_StirRandom.c
index 9b1657b..78757d3 100644
--- a/src/tss2-esys/api/Esys_StirRandom.c
+++ b/src/tss2-esys/api/Esys_StirRandom.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_TestParms.c b/src/tss2-esys/api/Esys_TestParms.c
index a2e786e..042d552 100644
--- a/src/tss2-esys/api/Esys_TestParms.c
+++ b/src/tss2-esys/api/Esys_TestParms.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_Unseal.c b/src/tss2-esys/api/Esys_Unseal.c
index 70566d1..a29cc11 100644
--- a/src/tss2-esys/api/Esys_Unseal.c
+++ b/src/tss2-esys/api/Esys_Unseal.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_Vendor_TCG_Test.c b/src/tss2-esys/api/Esys_Vendor_TCG_Test.c
index 26f9874..3ca7832 100644
--- a/src/tss2-esys/api/Esys_Vendor_TCG_Test.c
+++ b/src/tss2-esys/api/Esys_Vendor_TCG_Test.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_VerifySignature.c b/src/tss2-esys/api/Esys_VerifySignature.c
index e4d3bde..7743206 100644
--- a/src/tss2-esys/api/Esys_VerifySignature.c
+++ b/src/tss2-esys/api/Esys_VerifySignature.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/api/Esys_ZGen_2Phase.c b/src/tss2-esys/api/Esys_ZGen_2Phase.c
index 513cb02..adc736c 100644
--- a/src/tss2-esys/api/Esys_ZGen_2Phase.c
+++ b/src/tss2-esys/api/Esys_ZGen_2Phase.c
@@ -13,6 +13,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Store command parameters inside the ESYS_CONTEXT for use during _Finish */
static void store_input_parameters (
diff --git a/src/tss2-esys/esys_context.c b/src/tss2-esys/esys_context.c
index fbceaa6..2427a05 100644
--- a/src/tss2-esys/esys_context.c
+++ b/src/tss2-esys/esys_context.c
@@ -15,6 +15,7 @@
#include "esys_tcti_default.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Initialize an ESYS_CONTEXT for further use.
*
diff --git a/src/tss2-esys/esys_crypto.c b/src/tss2-esys/esys_crypto.c
index 8887d30..5c9a64e 100644
--- a/src/tss2-esys/esys_crypto.c
+++ b/src/tss2-esys/esys_crypto.c
@@ -15,6 +15,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Provide the digest size for a given hash algorithm.
*
diff --git a/src/tss2-esys/esys_crypto_gcrypt.c b/src/tss2-esys/esys_crypto_gcrypt.c
index 6b1e11f..b905eee 100644
--- a/src/tss2-esys/esys_crypto_gcrypt.c
+++ b/src/tss2-esys/esys_crypto_gcrypt.c
@@ -16,6 +16,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Context to hold temporary values for iesys_crypto */
typedef struct _IESYS_CRYPTO_CONTEXT {
diff --git a/src/tss2-esys/esys_crypto_ossl.c b/src/tss2-esys/esys_crypto_ossl.c
index 91871de..b1137ee 100644
--- a/src/tss2-esys/esys_crypto_ossl.c
+++ b/src/tss2-esys/esys_crypto_ossl.c
@@ -21,6 +21,7 @@
#include "esys_mu.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
#include "esys_crypto_ossl.h"
static ENGINE *engine = NULL;
diff --git a/src/tss2-esys/esys_iutil.c b/src/tss2-esys/esys_iutil.c
index d8b3985..9a2238f 100644
--- a/src/tss2-esys/esys_iutil.c
+++ b/src/tss2-esys/esys_iutil.c
@@ -12,6 +12,7 @@
#include "esys_int.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/**
* Compare variables of type UINT16.
diff --git a/src/tss2-esys/esys_iutil.h b/src/tss2-esys/esys_iutil.h
index dc52785..9403401 100644
--- a/src/tss2-esys/esys_iutil.h
+++ b/src/tss2-esys/esys_iutil.h
@@ -19,80 +19,6 @@
extern "C" {
#endif
-#define SAFE_FREE(S) if((S) != NULL) {free((void*) (S)); (S)=NULL;}
-
-#define TPM2_ERROR_FORMAT "%s%s (0x%08x)"
-#define TPM2_ERROR_TEXT(r) "Error", "Code", r
-
-#define return_if_error(r,msg) \
- if (r != TSS2_RC_SUCCESS) { \
- LOG_ERROR("%s " TPM2_ERROR_FORMAT, msg, TPM2_ERROR_TEXT(r)); \
- return r; \
- }
-
-#define return_state_if_error(r,s,msg) \
- if (r != TSS2_RC_SUCCESS) { \
- LOG_ERROR("%s " TPM2_ERROR_FORMAT, msg, TPM2_ERROR_TEXT(r)); \
- esysContext->state = s; \
- return r; \
- }
-
-#define return_error(r,msg) \
- { \
- LOG_ERROR("%s " TPM2_ERROR_FORMAT, msg, TPM2_ERROR_TEXT(r)); \
- return r; \
- }
-
-#define goto_state_if_error(r,s,msg,label) \
- if (r != TSS2_RC_SUCCESS) { \
- LOG_ERROR("%s " TPM2_ERROR_FORMAT, msg, TPM2_ERROR_TEXT(r)); \
- esysContext->state = s; \
- goto label; \
- }
-
-#define goto_if_null(p,msg,ec,label) \
- if ((p) == NULL) { \
- LOG_ERROR("%s ", (msg)); \
- r = (ec); \
- goto label; \
- }
-
-#define goto_if_error(r,msg,label) \
- if (r != TSS2_RC_SUCCESS) { \
- LOG_ERROR("%s " TPM2_ERROR_FORMAT, msg, TPM2_ERROR_TEXT(r)); \
- goto label; \
- }
-
-#define goto_error(r,v,msg,label, ...) \
- { r = v; \
- LOG_ERROR(TPM2_ERROR_FORMAT " " msg, TPM2_ERROR_TEXT(r), ## __VA_ARGS__); \
- goto label; \
- }
-
-#define return_if_null(p,msg,ec) \
- if (p == NULL) { \
- LOG_ERROR("%s ", msg); \
- return ec; \
- }
-
-#define return_if_notnull(p,msg,ec) \
- if (p != NULL) { \
- LOG_ERROR("%s ", msg); \
- return ec; \
- }
-
-#define exit_if_error(r,msg) \
- if (r != TSS2_RC_SUCCESS) { \
- LOG_ERROR("%s " TPM2_ERROR_FORMAT, msg, TPM2_ERROR_TEXT(r)); \
- exit(1); \
- }
-
-#define set_return_code(r_max, r, msg) \
- if (r != TSS2_RC_SUCCESS) { \
- LOG_ERROR("%s " TPM2_ERROR_FORMAT, msg, TPM2_ERROR_TEXT(r)); \
- r_max = r; \
- }
-
/** An entry in a cpHash or rpHash table. */
typedef struct {
TPM2_ALG_ID alg; /**< The hash algorithm. */
diff --git a/src/tss2-esys/esys_mu.c b/src/tss2-esys/esys_mu.c
index 3dbcc9e..73d354f 100644
--- a/src/tss2-esys/esys_mu.c
+++ b/src/tss2-esys/esys_mu.c
@@ -13,6 +13,7 @@
#include "esys_iutil.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Marshal an array of BYTE structures into a byte buffer.
*
diff --git a/src/tss2-esys/esys_tr.c b/src/tss2-esys/esys_tr.c
index a34efbb..9d380ed 100644
--- a/src/tss2-esys/esys_tr.c
+++ b/src/tss2-esys/esys_tr.c
@@ -10,6 +10,7 @@
#include "esys_iutil.h"
#define LOGMODULE esys
#include "util/log.h"
+#include "util/aux_util.h"
/** Serialization of an ESYS_TR into a byte buffer.
*
diff --git a/src/util/aux_util.h b/src/util/aux_util.h
new file mode 100644
index 0000000..3ab4917
--- /dev/null
+++ b/src/util/aux_util.h
@@ -0,0 +1,91 @@
+/* SPDX-License-Identifier: BSD-2 */
+/*******************************************************************************
+ * Copyright 2017-2018, Fraunhofer SIT sponsored by Infineon Technologies AG
+ * All rights reserved.
+ ******************************************************************************/
+#ifndef AUX_UTIL_H
+#define AUX_UTIL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define SAFE_FREE(S) if((S) != NULL) {free((void*) (S)); (S)=NULL;}
+
+#define TPM2_ERROR_FORMAT "%s%s (0x%08x)"
+#define TPM2_ERROR_TEXT(r) "Error", "Code", r
+
+#define return_if_error(r,msg) \
+ if (r != TSS2_RC_SUCCESS) { \
+ LOG_ERROR("%s " TPM2_ERROR_FORMAT, msg, TPM2_ERROR_TEXT(r)); \
+ return r; \
+ }
+
+#define return_state_if_error(r,s,msg) \
+ if (r != TSS2_RC_SUCCESS) { \
+ LOG_ERROR("%s " TPM2_ERROR_FORMAT, msg, TPM2_ERROR_TEXT(r)); \
+ esysContext->state = s; \
+ return r; \
+ }
+
+#define return_error(r,msg) \
+ { \
+ LOG_ERROR("%s " TPM2_ERROR_FORMAT, msg, TPM2_ERROR_TEXT(r)); \
+ return r; \
+ }
+
+#define goto_state_if_error(r,s,msg,label) \
+ if (r != TSS2_RC_SUCCESS) { \
+ LOG_ERROR("%s " TPM2_ERROR_FORMAT, msg, TPM2_ERROR_TEXT(r)); \
+ esysContext->state = s; \
+ goto label; \
+ }
+
+#define goto_if_null(p,msg,ec,label) \
+ if ((p) == NULL) { \
+ LOG_ERROR("%s ", (msg)); \
+ r = (ec); \
+ goto label; \
+ }
+
+#define goto_if_error(r,msg,label) \
+ if (r != TSS2_RC_SUCCESS) { \
+ LOG_ERROR("%s " TPM2_ERROR_FORMAT, msg, TPM2_ERROR_TEXT(r)); \
+ goto label; \
+ }
+
+#define goto_error(r,v,msg,label, ...) \
+ { r = v; \
+ LOG_ERROR(TPM2_ERROR_FORMAT " " msg, TPM2_ERROR_TEXT(r), ## __VA_ARGS__); \
+ goto label; \
+ }
+
+#define return_if_null(p,msg,ec) \
+ if (p == NULL) { \
+ LOG_ERROR("%s ", msg); \
+ return ec; \
+ }
+
+#define return_if_notnull(p,msg,ec) \
+ if (p != NULL) { \
+ LOG_ERROR("%s ", msg); \
+ return ec; \
+ }
+
+#define exit_if_error(r,msg) \
+ if (r != TSS2_RC_SUCCESS) { \
+ LOG_ERROR("%s " TPM2_ERROR_FORMAT, msg, TPM2_ERROR_TEXT(r)); \
+ exit(1); \
+ }
+
+#define set_return_code(r_max, r, msg) \
+ if (r != TSS2_RC_SUCCESS) { \
+ LOG_ERROR("%s " TPM2_ERROR_FORMAT, msg, TPM2_ERROR_TEXT(r)); \
+ r_max = r; \
+ }
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* AUX_UTIL_H */
diff --git a/test/integration/esys-audit.int.c b/test/integration/esys-audit.int.c
index 711b2e1..c888201 100644
--- a/test/integration/esys-audit.int.c
+++ b/test/integration/esys-audit.int.c
@@ -12,6 +12,7 @@
#include "test-esapi.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the ESAPI audit commands.
*
diff --git a/test/integration/esys-certify-creation.int.c b/test/integration/esys-certify-creation.int.c
index c23e10b..ebbdf63 100644
--- a/test/integration/esys-certify-creation.int.c
+++ b/test/integration/esys-certify-creation.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the command Esys_CertifyCreation.
*
diff --git a/test/integration/esys-certify.int.c b/test/integration/esys-certify.int.c
index d2811d2..080a97b 100644
--- a/test/integration/esys-certify.int.c
+++ b/test/integration/esys-certify.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the command Esys_Certify.
*
diff --git a/test/integration/esys-change-eps.int.c b/test/integration/esys-change-eps.int.c
index eee9228..84066c6 100644
--- a/test/integration/esys-change-eps.int.c
+++ b/test/integration/esys-change-eps.int.c
@@ -12,6 +12,7 @@
#include "test-esapi.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** Test the ESAPI function Esys_ChangeEPS.
*
diff --git a/test/integration/esys-clear-control.int.c b/test/integration/esys-clear-control.int.c
index 254f7e2..c0423bd 100644
--- a/test/integration/esys-clear-control.int.c
+++ b/test/integration/esys-clear-control.int.c
@@ -12,6 +12,7 @@
#include "test-esapi.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** Test the ESAPI function Esys_ClearControl.
*
diff --git a/test/integration/esys-clear.int.c b/test/integration/esys-clear.int.c
index e4d8d22..9dedfd6 100644
--- a/test/integration/esys-clear.int.c
+++ b/test/integration/esys-clear.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** Test of the ESAPI function Esys_Clear.
*
diff --git a/test/integration/esys-clockset.int.c b/test/integration/esys-clockset.int.c
index 40aa636..d671b3e 100644
--- a/test/integration/esys-clockset.int.c
+++ b/test/integration/esys-clockset.int.c
@@ -12,6 +12,7 @@
#include "test-esapi.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** Test the ESAPI function Esys_ClockSet and Esys_ReadClock.
*
diff --git a/test/integration/esys-commit.int.c b/test/integration/esys-commit.int.c
index 8102c11..c7d1223 100644
--- a/test/integration/esys-commit.int.c
+++ b/test/integration/esys-commit.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test Esys_Commit.
* based on an ECC key
diff --git a/test/integration/esys-create-fail.int.c b/test/integration/esys-create-fail.int.c
index 8696fd8..58ca414 100644
--- a/test/integration/esys-create-fail.int.c
+++ b/test/integration/esys-create-fail.int.c
@@ -12,6 +12,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test password authentication.
*
diff --git a/test/integration/esys-create-password-auth.int.c b/test/integration/esys-create-password-auth.int.c
index c99a999..746dd15 100644
--- a/test/integration/esys-create-password-auth.int.c
+++ b/test/integration/esys-create-password-auth.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test password authentication for the ESAPI command
* Create.
diff --git a/test/integration/esys-create-primary-hmac.int.c b/test/integration/esys-create-primary-hmac.int.c
index 23a398b..b5fede8 100644
--- a/test/integration/esys-create-primary-hmac.int.c
+++ b/test/integration/esys-create-primary-hmac.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test Esys_CreatePrimary with hmac verification.
*
diff --git a/test/integration/esys-create-session-auth.int.c b/test/integration/esys-create-session-auth.int.c
index 285504a..911479b 100644
--- a/test/integration/esys-create-session-auth.int.c
+++ b/test/integration/esys-create-session-auth.int.c
@@ -10,6 +10,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test parameter encryption/decryption, session management,
* hmac computation, and session key generation.
diff --git a/test/integration/esys-createloaded.int.c b/test/integration/esys-createloaded.int.c
index d6af24c..123b028 100644
--- a/test/integration/esys-createloaded.int.c
+++ b/test/integration/esys-createloaded.int.c
@@ -13,6 +13,7 @@
#include "test-esapi.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the ESAPI command CreateLoaded.
*
diff --git a/test/integration/esys-duplicate.int.c b/test/integration/esys-duplicate.int.c
index eca3d27..0059b68 100644
--- a/test/integration/esys-duplicate.int.c
+++ b/test/integration/esys-duplicate.int.c
@@ -13,6 +13,7 @@
#include "test-esapi.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the ESAPI commands Duplicate and Rewrap.
*
diff --git a/test/integration/esys-ecc-parameters.int.c b/test/integration/esys-ecc-parameters.int.c
index 7b6689a..de5b17d 100644
--- a/test/integration/esys-ecc-parameters.int.c
+++ b/test/integration/esys-ecc-parameters.int.c
@@ -12,6 +12,7 @@
#include "test-esapi.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** Test the ESAPI function Esys_ECC_Parameters.
*
diff --git a/test/integration/esys-ecdh-keygen.int.c b/test/integration/esys-ecdh-keygen.int.c
index 4a57f3e..d786f50 100644
--- a/test/integration/esys-ecdh-keygen.int.c
+++ b/test/integration/esys-ecdh-keygen.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test Esys_ECDH_KeyGen based on an ECC key
* created with Esys_CreatePrimary.
diff --git a/test/integration/esys-ecdh-zgen.int.c b/test/integration/esys-ecdh-zgen.int.c
index e75f399..91cb2f9 100644
--- a/test/integration/esys-ecdh-zgen.int.c
+++ b/test/integration/esys-ecdh-zgen.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test Esys_ECDH_ZGen.
* based on an ECC key
diff --git a/test/integration/esys-encrypt-decrypt.int.c b/test/integration/esys-encrypt-decrypt.int.c
index 4d05848..143a621 100644
--- a/test/integration/esys-encrypt-decrypt.int.c
+++ b/test/integration/esys-encrypt-decrypt.int.c
@@ -12,6 +12,7 @@
#include "test-esapi.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the ESAPI function Esys_EncryptDecrypt.
*
diff --git a/test/integration/esys-event-sequence-complete.int.c b/test/integration/esys-event-sequence-complete.int.c
index f33f72b..ce9c9d4 100644
--- a/test/integration/esys-event-sequence-complete.int.c
+++ b/test/integration/esys-event-sequence-complete.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** Test the ESAPI commands HashSequenceStart, SequenceUpdate,
* and EventSequenceComplete.
diff --git a/test/integration/esys-evict-control-serialization.int.c b/test/integration/esys-evict-control-serialization.int.c
index 9e0326b..8fe2f18 100644
--- a/test/integration/esys-evict-control-serialization.int.c
+++ b/test/integration/esys-evict-control-serialization.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test EvictControl and ESAPI Serialization.
*
diff --git a/test/integration/esys-field-upgrade.int.c b/test/integration/esys-field-upgrade.int.c
index 85e377a..d567a92 100644
--- a/test/integration/esys-field-upgrade.int.c
+++ b/test/integration/esys-field-upgrade.int.c
@@ -12,6 +12,7 @@
#include "test-esapi.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** Test the ESAPI function Esys_FieldUpgradeStart and Esys_FieldUpgradeData.
*
diff --git a/test/integration/esys-firmware-read.int.c b/test/integration/esys-firmware-read.int.c
index 69539e4..91f5029 100644
--- a/test/integration/esys-firmware-read.int.c
+++ b/test/integration/esys-firmware-read.int.c
@@ -12,6 +12,7 @@
#include "test-esapi.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** Test the ESAPI function Esys_FirmwareRead.
*
diff --git a/test/integration/esys-get-capability.int.c b/test/integration/esys-get-capability.int.c
index df9a1df..415668b 100644
--- a/test/integration/esys-get-capability.int.c
+++ b/test/integration/esys-get-capability.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the ESAPI get capability command.
*
diff --git a/test/integration/esys-get-random.int.c b/test/integration/esys-get-random.int.c
index af92813..a0be7bb 100644
--- a/test/integration/esys-get-random.int.c
+++ b/test/integration/esys-get-random.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** Test the ESAPI function Esys_GetRandom.
*
diff --git a/test/integration/esys-get-time.int.c b/test/integration/esys-get-time.int.c
index 9bf66db..6304ab4 100644
--- a/test/integration/esys-get-time.int.c
+++ b/test/integration/esys-get-time.int.c
@@ -12,6 +12,7 @@
#include "test-esapi.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the GetTime command with password
* authentication.
diff --git a/test/integration/esys-hash.int.c b/test/integration/esys-hash.int.c
index 0d6b281..036d2f3 100644
--- a/test/integration/esys-hash.int.c
+++ b/test/integration/esys-hash.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the ESAPI command Esys_HASH.
*
diff --git a/test/integration/esys-hashsequencestart.int.c b/test/integration/esys-hashsequencestart.int.c
index 4efa117..84aa4af 100644
--- a/test/integration/esys-hashsequencestart.int.c
+++ b/test/integration/esys-hashsequencestart.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** Test the ESAPI commands HashSequenceStart, SequenceUpdate,
* and SequenceComplete.
diff --git a/test/integration/esys-hierarchy-control.int.c b/test/integration/esys-hierarchy-control.int.c
index 33b9ebf..0f61d6e 100644
--- a/test/integration/esys-hierarchy-control.int.c
+++ b/test/integration/esys-hierarchy-control.int.c
@@ -12,6 +12,7 @@
#include "test-esapi.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** Test the ESAPI function Esys_HierarchyControl.
*
diff --git a/test/integration/esys-hierarchychangeauth.int.c b/test/integration/esys-hierarchychangeauth.int.c
index 1a284de..be59788 100644
--- a/test/integration/esys-hierarchychangeauth.int.c
+++ b/test/integration/esys-hierarchychangeauth.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the change of an authorization value of
* a hierarchy.
diff --git a/test/integration/esys-hmac.int.c b/test/integration/esys-hmac.int.c
index 6a8365a..a8d8121 100644
--- a/test/integration/esys-hmac.int.c
+++ b/test/integration/esys-hmac.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the ESAPI command Esys_HMAC with password
* authentication.
diff --git a/test/integration/esys-hmacsequencestart.int.c b/test/integration/esys-hmacsequencestart.int.c
index 15c3ebb..da6095f 100644
--- a/test/integration/esys-hmacsequencestart.int.c
+++ b/test/integration/esys-hmacsequencestart.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** Test the ESAPI commands: HMAC_Start, SequenceUpdate, and SequenceComplete.
*
diff --git a/test/integration/esys-import.int.c b/test/integration/esys-import.int.c
index bc069da..7165e56 100644
--- a/test/integration/esys-import.int.c
+++ b/test/integration/esys-import.int.c
@@ -12,6 +12,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the ESAPI commands Duplicate and Import.
*
diff --git a/test/integration/esys-lock.int.c b/test/integration/esys-lock.int.c
index 99568ee..e2d3c55 100644
--- a/test/integration/esys-lock.int.c
+++ b/test/integration/esys-lock.int.c
@@ -12,6 +12,7 @@
#include "test-esapi.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** Test the ESAPI functions related to TPM locks.
*
diff --git a/test/integration/esys-make-credential.int.c b/test/integration/esys-make-credential.int.c
index 8792c76..4d8e7e6 100644
--- a/test/integration/esys-make-credential.int.c
+++ b/test/integration/esys-make-credential.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the function Esys_MakeCredential
* We start by creating a primary key (Esys_CreatePrimary).
diff --git a/test/integration/esys-nv-certify.int.c b/test/integration/esys-nv-certify.int.c
index 25319b3..7e6f04b 100644
--- a/test/integration/esys-nv-certify.int.c
+++ b/test/integration/esys-nv-certify.int.c
@@ -12,6 +12,7 @@
#include "test-esapi.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the command Esys_NV_Certify.
*
diff --git a/test/integration/esys-nv-ram-counter.int.c b/test/integration/esys-nv-ram-counter.int.c
index 7f7550f..cd4375d 100644
--- a/test/integration/esys-nv-ram-counter.int.c
+++ b/test/integration/esys-nv-ram-counter.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the definition of a counter in NV ram and to
* test the ESAPI NV_Increment function.
diff --git a/test/integration/esys-nv-ram-extend-index.int.c b/test/integration/esys-nv-ram-extend-index.int.c
index 949fa77..6a0c2b1 100644
--- a/test/integration/esys-nv-ram-extend-index.int.c
+++ b/test/integration/esys-nv-ram-extend-index.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the ESAPI nv define space, nv extend, and
* nv read command.
diff --git a/test/integration/esys-nv-ram-ordinary-index.int.c b/test/integration/esys-nv-ram-ordinary-index.int.c
index 7ca00fe..2dacde5 100644
--- a/test/integration/esys-nv-ram-ordinary-index.int.c
+++ b/test/integration/esys-nv-ram-ordinary-index.int.c
@@ -12,6 +12,7 @@
#include "test-esapi.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the ESAPI commands nv define space, nv write,
* nv read command, nv lock write and nv lock read, and nv undefine.
diff --git a/test/integration/esys-nv-ram-set-bits.int.c b/test/integration/esys-nv-ram-set-bits.int.c
index 704137c..b69c2d5 100644
--- a/test/integration/esys-nv-ram-set-bits.int.c
+++ b/test/integration/esys-nv-ram-set-bits.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the definition of a bit field in NV ram and to
* test the ESAPI NV_SetBits function.
diff --git a/test/integration/esys-object-changeauth.int.c b/test/integration/esys-object-changeauth.int.c
index fe94c78..cf6d8f9 100644
--- a/test/integration/esys-object-changeauth.int.c
+++ b/test/integration/esys-object-changeauth.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the ESAPI command ObjectChangeAuth.
*
diff --git a/test/integration/esys-pcr-auth-value.int.c b/test/integration/esys-pcr-auth-value.int.c
index 367892b..82de208 100644
--- a/test/integration/esys-pcr-auth-value.int.c
+++ b/test/integration/esys-pcr-auth-value.int.c
@@ -13,6 +13,7 @@
#include "test-esapi.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** Test the commands Esys_PCR_SetAuthValue and Esys_PCR_SetAuthPolicy.
*
diff --git a/test/integration/esys-pcr-basic.int.c b/test/integration/esys-pcr-basic.int.c
index c8f22be..fee61e6 100644
--- a/test/integration/esys-pcr-basic.int.c
+++ b/test/integration/esys-pcr-basic.int.c
@@ -12,6 +12,7 @@
#include "test-esapi.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** Test the basic commands for PCR processing.
*
diff --git a/test/integration/esys-policy-authorize.int.c b/test/integration/esys-policy-authorize.int.c
index f817ba4..5670446 100644
--- a/test/integration/esys-policy-authorize.int.c
+++ b/test/integration/esys-policy-authorize.int.c
@@ -12,6 +12,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the ESAPI policy authorization.
*
diff --git a/test/integration/esys-policy-nv-changeauth.int.c b/test/integration/esys-policy-nv-changeauth.int.c
index d6149a1..9b6c809 100644
--- a/test/integration/esys-policy-nv-changeauth.int.c
+++ b/test/integration/esys-policy-nv-changeauth.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the ESAPI commands PolicyAuthValue,
* PolicyCommandCode, Esys_PolicyGetDigest, and NV_ChangeAuth.
diff --git a/test/integration/esys-policy-nv-undefine-special.int.c b/test/integration/esys-policy-nv-undefine-special.int.c
index e678862..9b02c4d 100644
--- a/test/integration/esys-policy-nv-undefine-special.int.c
+++ b/test/integration/esys-policy-nv-undefine-special.int.c
@@ -12,6 +12,7 @@
#include "test-esapi.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the ESAPI command Esys_NV_UndefineSpaceSpecial,
* The NV space attributes TPMA_NV_PLATFORMCREATE and TPMA_NV_POLICY_DELETE
diff --git a/test/integration/esys-policy-password.int.c b/test/integration/esys-policy-password.int.c
index 1fd2454..c169a60 100644
--- a/test/integration/esys-policy-password.int.c
+++ b/test/integration/esys-policy-password.int.c
@@ -12,6 +12,7 @@
#include "test-esapi.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the ESAPI command PolicyPassword.
*
diff --git a/test/integration/esys-policy-regression-opt.int.c b/test/integration/esys-policy-regression-opt.int.c
index 15dc438..52c419d 100644
--- a/test/integration/esys-policy-regression-opt.int.c
+++ b/test/integration/esys-policy-regression-opt.int.c
@@ -13,6 +13,7 @@
#include "test-esapi.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
#define FLUSH true
#define NOT_FLUSH false
diff --git a/test/integration/esys-policy-regression.int.c b/test/integration/esys-policy-regression.int.c
index de1007a..061b349 100644
--- a/test/integration/esys-policy-regression.int.c
+++ b/test/integration/esys-policy-regression.int.c
@@ -11,6 +11,7 @@
#include "test-esapi.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
#define FLUSH true
#define NOT_FLUSH false
diff --git a/test/integration/esys-policy-ticket.int.c b/test/integration/esys-policy-ticket.int.c
index 4db9014..4965b7b 100644
--- a/test/integration/esys-policy-ticket.int.c
+++ b/test/integration/esys-policy-ticket.int.c
@@ -13,6 +13,7 @@
#include "test-esapi.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the ESAPI policy commands related to
* signed authorization actions.
diff --git a/test/integration/esys-pp-commands.int.c b/test/integration/esys-pp-commands.int.c
index a4a3233..60564e1 100644
--- a/test/integration/esys-pp-commands.int.c
+++ b/test/integration/esys-pp-commands.int.c
@@ -12,6 +12,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** Test the ESAPI function Esys_PP_Commands.
*
diff --git a/test/integration/esys-quote.int.c b/test/integration/esys-quote.int.c
index a2af0d6..4dba920 100644
--- a/test/integration/esys-quote.int.c
+++ b/test/integration/esys-quote.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the quote command with password
* authentication.
diff --git a/test/integration/esys-rsa-encrypt-decrypt.int.c b/test/integration/esys-rsa-encrypt-decrypt.int.c
index 8eb76e9..0761eed 100644
--- a/test/integration/esys-rsa-encrypt-decrypt.int.c
+++ b/test/integration/esys-rsa-encrypt-decrypt.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test RSA encryption / decryption.
* with password
diff --git a/test/integration/esys-save-and-load-context.int.c b/test/integration/esys-save-and-load-context.int.c
index bc8f0ae..014343e 100644
--- a/test/integration/esys-save-and-load-context.int.c
+++ b/test/integration/esys-save-and-load-context.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test context save and load.
*
diff --git a/test/integration/esys-set-algorithm-set.int.c b/test/integration/esys-set-algorithm-set.int.c
index 08d6c50..39a1882 100644
--- a/test/integration/esys-set-algorithm-set.int.c
+++ b/test/integration/esys-set-algorithm-set.int.c
@@ -12,6 +12,7 @@
#include "test-esapi.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** Test the ESAPI function Esys_SetAlgorithmSet.
*
diff --git a/test/integration/esys-stir-random.int.c b/test/integration/esys-stir-random.int.c
index 76df351..ee84057 100644
--- a/test/integration/esys-stir-random.int.c
+++ b/test/integration/esys-stir-random.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** Test the ESAPI function Esys_StirRandom.
*
diff --git a/test/integration/esys-testparms.int.c b/test/integration/esys-testparms.int.c
index ec80713..3d17807 100644
--- a/test/integration/esys-testparms.int.c
+++ b/test/integration/esys-testparms.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** Test the ESAPI function Esys_TestParms.
*
diff --git a/test/integration/esys-tpm-tests.int.c b/test/integration/esys-tpm-tests.int.c
index 88225ea..fd66e15 100644
--- a/test/integration/esys-tpm-tests.int.c
+++ b/test/integration/esys-tpm-tests.int.c
@@ -10,6 +10,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** Test the ESAPI functions for TPM tests.
*
diff --git a/test/integration/esys-tr-fromTpmPublic-key.int.c b/test/integration/esys-tr-fromTpmPublic-key.int.c
index 2e8ea87..6df6068 100644
--- a/test/integration/esys-tr-fromTpmPublic-key.int.c
+++ b/test/integration/esys-tr-fromTpmPublic-key.int.c
@@ -10,6 +10,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This tests the Esys_TR_FromTPMPublic and Esys_TR_GetName functions by
* creating an NV Index and then attempting to retrieve an ESYS_TR object for
diff --git a/test/integration/esys-tr-fromTpmPublic-nv.int.c b/test/integration/esys-tr-fromTpmPublic-nv.int.c
index 1079749..fc7f58a 100644
--- a/test/integration/esys-tr-fromTpmPublic-nv.int.c
+++ b/test/integration/esys-tr-fromTpmPublic-nv.int.c
@@ -10,6 +10,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This tests the Esys_TR_FromTPMPublic and Esys_TR_GetName functions by
* creating an NV Index and then attempting to retrieve an ESYS_TR object for
diff --git a/test/integration/esys-tr-getName-hierarchy.int.c b/test/integration/esys-tr-getName-hierarchy.int.c
index cc8166e..c8da391 100644
--- a/test/integration/esys-tr-getName-hierarchy.int.c
+++ b/test/integration/esys-tr-getName-hierarchy.int.c
@@ -11,6 +11,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This tests the Esys_TR_FromTPMPublic and Esys_TR_GetName functions by
* creating an NV Index and then attempting to retrieve an ESYS_TR object for
diff --git a/test/integration/esys-unseal-password-auth.int.c b/test/integration/esys-unseal-password-auth.int.c
index 8523da4..c4bc257 100644
--- a/test/integration/esys-unseal-password-auth.int.c
+++ b/test/integration/esys-unseal-password-auth.int.c
@@ -20,6 +20,7 @@
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the unseal operation for the ESAPI command
* Unseal.
diff --git a/test/integration/esys-verify-signature.int.c b/test/integration/esys-verify-signature.int.c
index 807ea83..b1f2d85 100644
--- a/test/integration/esys-verify-signature.int.c
+++ b/test/integration/esys-verify-signature.int.c
@@ -12,6 +12,7 @@
#include "esys_iutil.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test the ESAPI signing and signature verification.
*
diff --git a/test/integration/esys-zgen-2phase.int.c b/test/integration/esys-zgen-2phase.int.c
index d60c7ed..61abee5 100644
--- a/test/integration/esys-zgen-2phase.int.c
+++ b/test/integration/esys-zgen-2phase.int.c
@@ -12,6 +12,7 @@
#include "test-esapi.h"
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
/** This test is intended to test Esys_ECDH_ZGen.
*
diff --git a/test/unit/esys-context-null.c b/test/unit/esys-context-null.c
index 5ec2571..3efbc48 100644
--- a/test/unit/esys-context-null.c
+++ b/test/unit/esys-context-null.c
@@ -11,6 +11,7 @@
#include <stdint.h>
#define LOGMODULE test
#include "util/log.h"
+#include "util/aux_util.h"
#include "tss2-sys/sysapi_util.h"
#include <tss2_esys.h>
#include "esys_types.h"
diff --git a/test/unit/esys-resubmissions.c b/test/unit/esys-resubmissions.c
index de601a3..5ddaf83 100644
--- a/test/unit/esys-resubmissions.c
+++ b/test/unit/esys-resubmissions.c
@@ -17,6 +17,7 @@
#include "tss2-esys/esys_iutil.h"
#define LOGMODULE tests
#include "util/log.h"
+#include "util/aux_util.h"
/**
* This unit test looks into a set of Esys_<cmd>() functions and tests the
diff --git a/test/unit/esys-sequence-finish.c b/test/unit/esys-sequence-finish.c
index 02d0d83..e13d3f9 100644
--- a/test/unit/esys-sequence-finish.c
+++ b/test/unit/esys-sequence-finish.c
@@ -17,6 +17,7 @@
#include "tss2-esys/esys_iutil.h"
#define LOGMODULE tests
#include "util/log.h"
+#include "util/aux_util.h"
/*
* Tests whether all ESAPI finish calls handle wrong internal states with the correct
diff --git a/test/unit/esys-tcti-rcs.c b/test/unit/esys-tcti-rcs.c
index 4e484bd..dfbb5a3 100644
--- a/test/unit/esys-tcti-rcs.c
+++ b/test/unit/esys-tcti-rcs.c
@@ -17,6 +17,7 @@
#include "tss2-esys/esys_iutil.h"
#define LOGMODULE tests
#include "util/log.h"
+#include "util/aux_util.h"
/**
* This unit test looks into a set of Esys_<cmd>() functions and tests the
diff --git a/test/unit/esys-tpm-rcs.c b/test/unit/esys-tpm-rcs.c
index 76907e5..315edfd 100644
--- a/test/unit/esys-tpm-rcs.c
+++ b/test/unit/esys-tpm-rcs.c
@@ -17,6 +17,7 @@
#include "tss2-esys/esys_iutil.h"
#define LOGMODULE tests
#include "util/log.h"
+#include "util/aux_util.h"
/**
* This unit test looks into a set of Esys_<cmd>() functions and tests the