test: Remove use of 'sysapi_util.h' from integration tests.

These tests don't test any of the code from the sysapi_util module. The
only use was to get the size of a structure defined there but this is
exposed through the tss2-sys API directly. Inclusion of this header is
largely an artifact of this code having been liberated from the legacy
`tpmclient` test.

Signed-off-by: Philip Tricca <philip.b.tricca@intel.com>

5 files changed, 2 insertions, 8 deletions

diff --git a/test/integration/esys-unseal-password-auth.int.c b/test/integration/esys-unseal-password-auth.int.c
index c4bc2571..f92985fd 100644
--- a/test/integration/esys-unseal-password-auth.int.c
+++ b/test/integration/esys-unseal-password-auth.int.c
@@ -12,7 +12,6 @@
 #include <stdint.h>
 
 #include <tss2_esys.h>
-#include "tss2-sys/sysapi_util.h"
 
 #include "test.h"
 #include "esys_types.h"
diff --git a/test/integration/sapi-entity-util.c b/test/integration/sapi-entity-util.c
index 4ecaf02f..b807f3d1 100644
--- a/test/integration/sapi-entity-util.c
+++ b/test/integration/sapi-entity-util.c
@@ -5,7 +5,6 @@
  * All rights reserved.
  ***********************************************************************/
 #include "tss2_tpm2_types.h"
-#include "sysapi_util.h"
 #include "sapi-util.h"
 #include "session-util.h"
 
diff --git a/test/integration/sapi-pcr-extension.int.c b/test/integration/sapi-pcr-extension.int.c
index c4b0b8cf..1bcba067 100644
--- a/test/integration/sapi-pcr-extension.int.c
+++ b/test/integration/sapi-pcr-extension.int.c
@@ -13,7 +13,6 @@
 #define LOGMODULE test
 #include "util/log.h"
 #include "test.h"
-#include "sysapi_util.h"
 #include "sapi-util.h"
 #define PCR_8   8
 /**
diff --git a/test/integration/sapi-sys-initialize.int.c b/test/integration/sapi-sys-initialize.int.c
index 8f2beac0..ea160d9c 100644
--- a/test/integration/sapi-sys-initialize.int.c
+++ b/test/integration/sapi-sys-initialize.int.c
@@ -9,8 +9,6 @@
 
 #include "tss2_sys.h"
 
-#include "tss2-sys/sysapi_util.h"
-
 #define LOGMODULE test
 #include "util/log.h"
 #include "test.h"
@@ -50,7 +48,7 @@ test_invoke (TSS2_SYS_CONTEXT *sapi_context)
     TSS2_TCTI_RECEIVE (&tctiContext) = (TSS2_TCTI_RECEIVE_FCN)1;
     TSS2_TCTI_TRANSMIT (&tctiContext) = (TSS2_TCTI_TRANSMIT_FCN)0;
 
-    rc = Tss2_Sys_Initialize( (TSS2_SYS_CONTEXT *)1, sizeof( _TSS2_SYS_CONTEXT_BLOB ), (TSS2_TCTI_CONTEXT *)&tctiContext, (TSS2_ABI_VERSION *)1 );
+    rc = Tss2_Sys_Initialize( (TSS2_SYS_CONTEXT *)1, Tss2_Sys_GetContextSize (0), (TSS2_TCTI_CONTEXT *)&tctiContext, (TSS2_ABI_VERSION *)1 );
     if( rc != TSS2_SYS_RC_BAD_TCTI_STRUCTURE ) {
         LOG_ERROR("Sys_Initialize FAILED! Response Code : %x", rc);
         exit(1);
@@ -60,7 +58,7 @@ test_invoke (TSS2_SYS_CONTEXT *sapi_context)
     TSS2_TCTI_RECEIVE (&tctiContext) = (TSS2_TCTI_RECEIVE_FCN)0;
     TSS2_TCTI_TRANSMIT (&tctiContext) = (TSS2_TCTI_TRANSMIT_FCN)1;
 
-    rc = Tss2_Sys_Initialize( (TSS2_SYS_CONTEXT *)1, sizeof( _TSS2_SYS_CONTEXT_BLOB ), (TSS2_TCTI_CONTEXT *)&tctiContext, (TSS2_ABI_VERSION *)1 );
+    rc = Tss2_Sys_Initialize( (TSS2_SYS_CONTEXT *)1, Tss2_Sys_GetContextSize (0), (TSS2_TCTI_CONTEXT *)&tctiContext, (TSS2_ABI_VERSION *)1 );
     if( rc != TSS2_SYS_RC_BAD_TCTI_STRUCTURE ) {
         LOG_ERROR("Sys_Initialize FAILED! Response Code : %x", rc);
         exit(1);
diff --git a/test/integration/sapi-tpm-properties.int.c b/test/integration/sapi-tpm-properties.int.c
index b2598ed0..b8873a12 100644
--- a/test/integration/sapi-tpm-properties.int.c
+++ b/test/integration/sapi-tpm-properties.int.c
@@ -12,7 +12,6 @@
 #define LOGMODULE test
 #include "util/log.h"
 #include "test.h"
-#include "sysapi_util.h"
 
 int
 test_invoke (TSS2_SYS_CONTEXT *sapi_context)