build: Install headers to $(includedir)/tss2, prefixed with tss2_
This commit updates our source layout so that all headers that are
installed on the platform are in $(srcdir)/include/tss2. When installed
these will end up at $(includedir)/tss2.
This change requires a number of updates to the source tree to fixup
paths and filenames used in 'include' statements. This was an
opportunity to impose some discipline on our use of the include
statement in general. All statements that were updated follow these
conventions
- When including headers that are installed use the quoted form of
`include` and do not include the `tss2` path prefix.
- When including headers that are in the source tree use the quoted form
of `include` and use the path to the header relative to $(srcdir).
These conventions make it less likely that an implementation file will
include an installed header instead of the copy in the source tree.
Additionally they allow us to simplify the use of CFLAGS in the automake
files which was getting a bit out of control. This simplification
removed 50 redundant lines from Makefile-test.am
Signed-off-by: Philip Tricca <philip.b.tricca@intel.com>
diff --git a/Makefile-test.am b/Makefile-test.am
index eb65b17..e0d8b2a 100644
--- a/Makefile-test.am
+++ b/Makefile-test.am
@@ -26,7 +26,8 @@
# THE POSSIBILITY OF SUCH DAMAGE.
#;**********************************************************************;
-TESTS_CFLAGS = $(LIBCRYPTO_CFLAGS)
+TESTS_CFLAGS = $(AM_CFLAGS) $(LIBCRYPTO_CFLAGS) -I$(srcdir)/marshal \
+ -I$(srcdir)/sysapi/include -I$(srcdir)/esapi/esapi_util
TESTS_LDADD = $(noinst_LTLIBRARIES) $(lib_LTLIBRARIES) $(LIBCRYPTO_LIBS) $(libutil)
# test harness configuration
@@ -128,78 +129,78 @@
test/unit/*.log
if UNIT
-test_unit_util_CFLAGS = $(CMOCKA_CFLAGS) $(AM_CFLAGS)
+test_unit_util_CFLAGS = $(CMOCKA_CFLAGS) $(TESTS_CFLAGS)
test_unit_util_LDADD = $(CMOCKA_LIBS) $(libutil) $(libmarshal)
test_unit_util_LDFLAGS = -Wl,--wrap=write
test_unit_util_SOURCES = test/unit/util.c
-test_unit_tcti_device_CFLAGS = $(CMOCKA_CFLAGS) $(AM_CFLAGS)
+test_unit_tcti_device_CFLAGS = $(CMOCKA_CFLAGS) $(TESTS_CFLAGS)
test_unit_tcti_device_LDADD = $(CMOCKA_LIBS) $(libmarshal) $(libutil)
test_unit_tcti_device_LDFLAGS = -Wl,--wrap=read -Wl,-wrap=write
test_unit_tcti_device_SOURCES = test/unit/tcti-device.c tcti/tcti_device.c log/log.h
-test_unit_tcti_mssim_CFLAGS = $(CMOCKA_CFLAGS) $(AM_CFLAGS) $(URIPARSER_CFLAGS)
+test_unit_tcti_mssim_CFLAGS = $(CMOCKA_CFLAGS) $(TESTS_CFLAGS) $(URIPARSER_CFLAGS)
test_unit_tcti_mssim_LDADD = $(CMOCKA_LIBS) $(libmarshal) $(URIPARSER_LIBS) $(libutil)
test_unit_tcti_mssim_LDFLAGS = -Wl,--wrap=connect,--wrap=read,--wrap=select,--wrap=write
test_unit_tcti_mssim_SOURCES = tcti/tcti-mssim.c tcti/sockets.c \
tcti/sockets.h test/unit/tcti-mssim.c
-test_unit_socket_CFLAGS = $(CMOCKA_CFLAGS) $(AM_CFLAGS)
+test_unit_socket_CFLAGS = $(CMOCKA_CFLAGS) $(TESTS_CFLAGS)
test_unit_socket_LDADD = $(CMOCKA_LIBS) $(libutil) $(libmarshal)
test_unit_socket_LDFLAGS = -Wl,--wrap=connect,--wrap=socket
test_unit_socket_SOURCES = test/unit/socket.c tcti/sockets.c tcti/sockets.h
-test_unit_CommonPreparePrologue_CFLAGS = $(CMOCKA_CFLAGS) $(AM_CFLAGS)
+test_unit_CommonPreparePrologue_CFLAGS = $(CMOCKA_CFLAGS) $(TESTS_CFLAGS)
test_unit_CommonPreparePrologue_LDFLAGS = -Wl,--unresolved-symbols=ignore-all
test_unit_CommonPreparePrologue_LDADD = $(CMOCKA_LIBS) $(libsapi)
test_unit_CommonPreparePrologue_SOURCES = test/unit/CommonPreparePrologue.c
-test_unit_GetNumHandles_CFLAGS = $(CMOCKA_CFLAGS) $(AM_CFLAGS)
+test_unit_GetNumHandles_CFLAGS = $(CMOCKA_CFLAGS) $(TESTS_CFLAGS)
test_unit_GetNumHandles_LDADD = $(CMOCKA_LIBS) $(libsapi)
test_unit_GetNumHandles_SOURCES = test/unit/GetNumHandles.c
-test_unit_CopyCommandHeader_CFLAGS = $(CMOCKA_CFLAGS) $(AM_CFLAGS)
+test_unit_CopyCommandHeader_CFLAGS = $(CMOCKA_CFLAGS) $(TESTS_CFLAGS)
test_unit_CopyCommandHeader_LDFLAGS = -Wl,--unresolved-symbols=ignore-all
test_unit_CopyCommandHeader_LDADD = $(CMOCKA_LIBS) $(libsapi)
test_unit_CopyCommandHeader_SOURCES = test/unit/CopyCommandHeader.c
-test_unit_UINT8_marshal_CFLAGS = $(CMOCKA_CFLAGS) $(AM_CFLAGS)
+test_unit_UINT8_marshal_CFLAGS = $(CMOCKA_CFLAGS) $(TESTS_CFLAGS)
test_unit_UINT8_marshal_LDADD = $(CMOCKA_LIBS) $(libmarshal)
test_unit_UINT8_marshal_SOURCES = test/unit/UINT8-marshal.c
-test_unit_UINT16_marshal_CFLAGS = $(CMOCKA_CFLAGS) $(AM_CFLAGS)
+test_unit_UINT16_marshal_CFLAGS = $(CMOCKA_CFLAGS) $(TESTS_CFLAGS)
test_unit_UINT16_marshal_LDADD = $(CMOCKA_LIBS) $(libmarshal)
test_unit_UINT16_marshal_SOURCES = test/unit/UINT16-marshal.c
-test_unit_UINT32_marshal_CFLAGS = $(CMOCKA_CFLAGS) $(AM_CFLAGS)
+test_unit_UINT32_marshal_CFLAGS = $(CMOCKA_CFLAGS) $(TESTS_CFLAGS)
test_unit_UINT32_marshal_LDADD = $(CMOCKA_LIBS) $(libmarshal)
test_unit_UINT32_marshal_SOURCES = test/unit/UINT32-marshal.c
-test_unit_UINT64_marshal_CFLAGS = $(CMOCKA_CFLAGS) $(AM_CFLAGS)
+test_unit_UINT64_marshal_CFLAGS = $(CMOCKA_CFLAGS) $(TESTS_CFLAGS)
test_unit_UINT64_marshal_LDADD = $(CMOCKA_LIBS) $(libmarshal)
test_unit_UINT64_marshal_SOURCES = test/unit/UINT64-marshal.c
-test_unit_TPMA_marshal_CFLAGS = $(CMOCKA_CFLAGS) $(AM_CFLAGS)
+test_unit_TPMA_marshal_CFLAGS = $(CMOCKA_CFLAGS) $(TESTS_CFLAGS)
test_unit_TPMA_marshal_LDADD = $(CMOCKA_LIBS) $(libmarshal)
test_unit_TPMA_marshal_SOURCES = test/unit/TPMA-marshal.c
-test_unit_TPM2B_marshal_CFLAGS = $(CMOCKA_CFLAGS) $(AM_CFLAGS)
+test_unit_TPM2B_marshal_CFLAGS = $(CMOCKA_CFLAGS) $(TESTS_CFLAGS)
test_unit_TPM2B_marshal_LDADD = $(CMOCKA_LIBS) $(libmarshal)
test_unit_TPM2B_marshal_SOURCES = test/unit/TPM2B-marshal.c
-test_unit_TPMS_marshal_CFLAGS = $(CMOCKA_CFLAGS) $(AM_CFLAGS)
+test_unit_TPMS_marshal_CFLAGS = $(CMOCKA_CFLAGS) $(TESTS_CFLAGS)
test_unit_TPMS_marshal_LDADD = $(CMOCKA_LIBS) $(libmarshal)
test_unit_TPMS_marshal_SOURCES = test/unit/TPMS-marshal.c
-test_unit_TPML_marshal_CFLAGS = $(CMOCKA_CFLAGS) $(AM_CFLAGS)
+test_unit_TPML_marshal_CFLAGS = $(CMOCKA_CFLAGS) $(TESTS_CFLAGS)
test_unit_TPML_marshal_LDADD = $(CMOCKA_LIBS) $(libmarshal)
test_unit_TPML_marshal_SOURCES = test/unit/TPML-marshal.c
-test_unit_TPMT_marshal_CFLAGS = $(CMOCKA_CFLAGS) $(AM_CFLAGS)
+test_unit_TPMT_marshal_CFLAGS = $(CMOCKA_CFLAGS) $(TESTS_CFLAGS)
test_unit_TPMT_marshal_LDADD = $(CMOCKA_LIBS) $(libmarshal)
test_unit_TPMT_marshal_SOURCES = test/unit/TPMT-marshal.c
-test_unit_TPMU_marshal_CFLAGS = $(CMOCKA_CFLAGS) $(AM_CFLAGS)
+test_unit_TPMU_marshal_CFLAGS = $(CMOCKA_CFLAGS) $(TESTS_CFLAGS)
test_unit_TPMU_marshal_LDADD = $(CMOCKA_LIBS) $(libmarshal)
test_unit_TPMU_marshal_SOURCES = test/unit/TPMU-marshal.c
endif # UNIT
@@ -302,297 +303,239 @@
test/integration/system-api.int.c
if ESAPI
-test_integration_esys_clear_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util
+test_integration_esys_clear_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_clear_int_LDADD = $(TESTS_LDADD)
test_integration_esys_clear_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_clear_int_SOURCES = \
test/integration/esys-clear.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_clear_session_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util -DTEST_SESSION
+test_integration_esys_clear_session_int_CFLAGS = $(TESTS_CFLAGS) \
+ -DTEST_SESSION
test_integration_esys_clear_session_int_LDADD = $(TESTS_LDADD)
test_integration_esys_clear_session_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_clear_session_int_SOURCES = \
test/integration/esys-clear.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_clockset_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util
+test_integration_esys_clockset_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_clockset_int_LDADD = $(TESTS_LDADD)
test_integration_esys_clockset_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_clockset_int_SOURCES = \
test/integration/esys-clockset.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_clockset_session_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util -DTEST_SESSION
+test_integration_esys_clockset_session_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_clockset_session_int_LDADD = $(TESTS_LDADD)
test_integration_esys_clockset_session_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_clockset_session_int_SOURCES = \
test/integration/esys-clockset.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_create_fail_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util
+test_integration_esys_create_fail_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_create_fail_int_LDADD = $(TESTS_LDADD)
test_integration_esys_create_fail_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_create_fail_int_SOURCES = \
test/integration/esys-create-fail.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_createloaded_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util
+test_integration_esys_createloaded_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_createloaded_int_LDADD = $(TESTS_LDADD)
test_integration_esys_createloaded_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_createloaded_int_SOURCES = \
test/integration/esys-createloaded.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_createloaded_session_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util -DTEST_SESSION
+test_integration_esys_createloaded_session_int_CFLAGS = $(TESTS_CFLAGS) \
+ -DTEST_SESSION
test_integration_esys_createloaded_session_int_LDADD = $(TESTS_LDADD)
test_integration_esys_createloaded_session_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_createloaded_session_int_SOURCES = \
test/integration/esys-createloaded.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_create_password_auth_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util
+test_integration_esys_create_password_auth_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_create_password_auth_int_LDADD = $(TESTS_LDADD)
test_integration_esys_create_password_auth_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_create_password_auth_int_SOURCES = \
test/integration/esys-create-password-auth.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_create_primary_ecc_hmac_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util
+test_integration_esys_create_primary_ecc_hmac_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_create_primary_ecc_hmac_int_LDADD = $(TESTS_LDADD)
test_integration_esys_create_primary_ecc_hmac_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_create_primary_ecc_hmac_int_SOURCES = \
test/integration/esys-create-primary-hmac.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_create_primary_hmac_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util
+test_integration_esys_create_primary_hmac_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_create_primary_hmac_int_LDADD = $(TESTS_LDADD)
test_integration_esys_create_primary_hmac_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_create_primary_hmac_int_SOURCES = \
test/integration/esys-create-primary-hmac.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_create_session_auth_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util
+test_integration_esys_create_session_auth_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_create_session_auth_int_LDADD = $(TESTS_LDADD)
test_integration_esys_create_session_auth_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_create_session_auth_int_SOURCES = \
test/integration/esys-create-session-auth.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_evict_control_serialization_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util
+test_integration_esys_evict_control_serialization_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_evict_control_serialization_int_LDADD = $(TESTS_LDADD)
test_integration_esys_evict_control_serialization_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_evict_control_serialization_int_SOURCES = \
test/integration/esys-evict-control-serialization.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_get_capability_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util
+test_integration_esys_get_capability_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_get_capability_int_LDADD = $(TESTS_LDADD)
test_integration_esys_get_capability_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_get_capability_int_SOURCES = \
test/integration/esys-get-capability.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_get_random_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util
+test_integration_esys_get_random_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_get_random_int_LDADD = $(TESTS_LDADD)
test_integration_esys_get_random_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_get_random_int_SOURCES = \
test/integration/esys-get-random.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_hashsequencestart_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util
+test_integration_esys_hashsequencestart_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_hashsequencestart_int_LDADD = $(TESTS_LDADD)
test_integration_esys_hashsequencestart_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_hashsequencestart_int_SOURCES = \
test/integration/esys-hashsequencestart.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_hashsequencestart_session_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util -DTEST_SESSION
+test_integration_esys_hashsequencestart_session_int_CFLAGS = $(TESTS_CFLAGS) \
+ -DTEST_SESSION
test_integration_esys_hashsequencestart_session_int_LDADD = $(TESTS_LDADD)
test_integration_esys_hashsequencestart_session_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_hashsequencestart_session_int_SOURCES = \
test/integration/esys-hashsequencestart.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_hmacsequencestart_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util
+test_integration_esys_hmacsequencestart_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_hmacsequencestart_int_LDADD = $(TESTS_LDADD)
test_integration_esys_hmacsequencestart_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_hmacsequencestart_int_SOURCES = \
test/integration/esys-hmacsequencestart.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_hmacsequencestart_session_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util -DTEST_SESSION
+test_integration_esys_hmacsequencestart_session_int_CFLAGS = $(TESTS_CFLAGS) \
+ -DTEST_SESSION
test_integration_esys_hmacsequencestart_session_int_LDADD = $(TESTS_LDADD)
test_integration_esys_hmacsequencestart_session_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_hmacsequencestart_session_int_SOURCES = \
test/integration/esys-hmacsequencestart.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_hierarchychangeauth_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util
+test_integration_esys_hierarchychangeauth_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_hierarchychangeauth_int_LDADD = $(TESTS_LDADD)
test_integration_esys_hierarchychangeauth_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_hierarchychangeauth_int_SOURCES = \
test/integration/esys-hierarchychangeauth.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_make_credential_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util
+test_integration_esys_make_credential_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_make_credential_int_LDADD = $(TESTS_LDADD)
test_integration_esys_make_credential_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_make_credential_int_SOURCES = \
test/integration/esys-make-credential.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_make_credential_session_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util -DTEST_SESSION
+test_integration_esys_make_credential_session_int_CFLAGS = $(TESTS_CFLAGS) \
+ -DTEST_SESSION
test_integration_esys_make_credential_session_int_LDADD = $(TESTS_LDADD)
test_integration_esys_make_credential_session_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_make_credential_session_int_SOURCES = \
test/integration/esys-make-credential.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_nv_ram_counter_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util
+test_integration_esys_nv_ram_counter_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_nv_ram_counter_int_LDADD = $(TESTS_LDADD)
test_integration_esys_nv_ram_counter_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_nv_ram_counter_int_SOURCES = \
test/integration/esys-nv-ram-counter.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_nv_ram_counter_session_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util -DTEST_SESSION
+test_integration_esys_nv_ram_counter_session_int_CFLAGS = $(TESTS_CFLAGS) \
+ -DTEST_SESSION
test_integration_esys_nv_ram_counter_session_int_LDADD = $(TESTS_LDADD)
test_integration_esys_nv_ram_counter_session_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_nv_ram_counter_session_int_SOURCES = \
test/integration/esys-nv-ram-counter.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_nv_ram_extend_index_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util
+test_integration_esys_nv_ram_extend_index_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_nv_ram_extend_index_int_LDADD = $(TESTS_LDADD)
test_integration_esys_nv_ram_extend_index_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_nv_ram_extend_index_int_SOURCES = \
test/integration/esys-nv-ram-extend-index.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_nv_ram_extend_index_session_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util -DTEST_SESSION
+test_integration_esys_nv_ram_extend_index_session_int_CFLAGS = $(TESTS_CFLAGS) \
+ -DTEST_SESSION
test_integration_esys_nv_ram_extend_index_session_int_LDADD = $(TESTS_LDADD)
test_integration_esys_nv_ram_extend_index_session_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_nv_ram_extend_index_session_int_SOURCES = \
test/integration/esys-nv-ram-extend-index.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_nv_ram_set_bits_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util
+test_integration_esys_nv_ram_set_bits_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_nv_ram_set_bits_int_LDADD = $(TESTS_LDADD)
test_integration_esys_nv_ram_set_bits_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_nv_ram_set_bits_int_SOURCES = \
test/integration/esys-nv-ram-set-bits.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_nv_ram_set_bits_session_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util -DTEST_SESSION
+test_integration_esys_nv_ram_set_bits_session_int_CFLAGS = $(TESTS_CFLAGS) \
+ -DTEST_SESSION
test_integration_esys_nv_ram_set_bits_session_int_LDADD = $(TESTS_LDADD)
test_integration_esys_nv_ram_set_bits_session_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_nv_ram_set_bits_session_int_SOURCES = \
test/integration/esys-nv-ram-set-bits.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_object_changeauth_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util
+test_integration_esys_object_changeauth_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_object_changeauth_int_LDADD = $(TESTS_LDADD)
test_integration_esys_object_changeauth_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_object_changeauth_int_SOURCES = \
test/integration/esys-object-changeauth.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_policy_nv_changeauth_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util
+test_integration_esys_policy_nv_changeauth_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_policy_nv_changeauth_int_LDADD = $(TESTS_LDADD)
test_integration_esys_policy_nv_changeauth_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_policy_nv_changeauth_int_SOURCES = \
test/integration/esys-policy-nv-changeauth.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_policy_password_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util
+test_integration_esys_policy_password_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_policy_password_int_LDADD = $(TESTS_LDADD)
test_integration_esys_policy_password_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_policy_password_int_SOURCES = \
test/integration/esys-policy-password.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_quote_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util
+test_integration_esys_quote_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_quote_int_LDADD = $(TESTS_LDADD)
test_integration_esys_quote_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_quote_int_SOURCES = \
test/integration/esys-quote.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_rsa_encrypt_decrypt_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util
+test_integration_esys_rsa_encrypt_decrypt_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_rsa_encrypt_decrypt_int_LDADD = $(TESTS_LDADD)
test_integration_esys_rsa_encrypt_decrypt_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_rsa_encrypt_decrypt_int_SOURCES = \
test/integration/esys-rsa-encrypt-decrypt.int.c \
test/integration/main-esapi.c test/integration/test-esapi.h
-test_integration_esys_save_and_load_context_int_CFLAGS = $(AM_CFLAGS) \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util
+test_integration_esys_save_and_load_context_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_esys_save_and_load_context_int_LDADD = $(TESTS_LDADD)
test_integration_esys_save_and_load_context_int_LDFLAGS = $(TESTS_LDFLAGS) -lgcrypt
test_integration_esys_save_and_load_context_int_SOURCES = \
@@ -600,22 +543,22 @@
test/integration/main-esapi.c test/integration/test-esapi.h
endif #ESAPI
-test_integration_policy_template_int_CFLAGS = $(AM_CFLAGS) $(TESTS_CFLAGS)
+test_integration_policy_template_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_policy_template_int_LDADD = $(TESTS_LDADD)
test_integration_policy_template_int_SOURCES = test/integration/main.c \
test/integration/policy-template.int.c
-test_integration_create_loaded_int_CFLAGS = $(AM_CFLAGS) $(TESTS_CFLAGS)
+test_integration_create_loaded_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_create_loaded_int_LDADD = $(TESTS_LDADD)
test_integration_create_loaded_int_SOURCES = test/integration/main.c \
test/integration/create-loaded.int.c
-test_integration_policy_authorizeNV_int_CFLAGS = $(AM_CFLAGS) $(TESTS_CFLAGS)
+test_integration_policy_authorizeNV_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_policy_authorizeNV_int_LDADD = $(TESTS_LDADD)
test_integration_policy_authorizeNV_int_SOURCES = test/integration/main.c log/log.h log/log.c \
test/integration/policy-authorizeNV.int.c
-test_integration_command_cancel_int_CFLAGS = $(AM_CFLAGS) $(TESTS_CFLAGS)
+test_integration_command_cancel_int_CFLAGS = $(TESTS_CFLAGS)
test_integration_command_cancel_int_LDADD = $(TESTS_LDADD)
test_integration_command_cancel_int_SOURCES = test/integration/main.c log/log.h log/log.c \
test/integration/command-cancel.int.c
diff --git a/Makefile.am b/Makefile.am
index d721996..3873fb4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@
#;**********************************************************************;
### Initialize global variables used throughout the file ###
-INCLUDE_DIRS = -I$(srcdir)/include -I$(srcdir)/sysapi/include -I$(srcdir)/marshal
+INCLUDE_DIRS = -I$(srcdir) -I$(srcdir)/include/tss2
ACLOCAL_AMFLAGS = -I m4
AM_CFLAGS = $(INCLUDE_DIRS) $(EXTRA_CFLAGS) $(CODE_COVERAGE_CFLAGS)
AM_LDFLAGS = $(EXTRA_LDFLAGS) $(CODE_COVERAGE_LIBS)
@@ -82,6 +82,14 @@
s,[@]libdir[@],$(libdir),g; \
s,[@]includedir[@],$(includedir),g;" $^ > $@
+# Base TSS2 headers
+tss2dir = $(includedir)/tss2
+tss2_HEADERS = \
+ $(srcdir)/include/tss2/tss2_common.h \
+ $(srcdir)/include/tss2/tss2_tcti.h \
+ $(srcdir)/include/tss2/tss2_tpm2_types.h \
+ $(srcdir)/include/tss2/tpm20.h
+
### Internal utility library
libutil = libutil.la
noinst_LTLIBRARIES += $(libutil)
@@ -90,7 +98,10 @@
### TCG TSS Marshaling/Unmarshalling spec library ###
libmarshal = marshal/libmarshal.la
+tss2_HEADERS += $(srcdir)/include/tss2/tss2_mu.h
lib_LTLIBRARIES += $(libmarshal)
+nodist_pkgconfig_DATA += lib/marshal.pc
+EXTRA_DIST += lib/libmarshal.map lib/marshal.pc.in
if HAVE_LD_VERSION_SCRIPT
marshal_libmarshal_la_LDFLAGS = -Wl,--version-script=$(srcdir)/lib/libmarshal.map
@@ -98,18 +109,13 @@
marshal_libmarshal_la_LIBADD = $(libutil)
marshal_libmarshal_la_SOURCES = $(MARSHAL_SRC)
-nodist_pkgconfig_DATA += lib/marshal.pc
-EXTRA_DIST += \
- lib/libmarshal.map \
- lib/marshal.pc.in
-
### TCG TSS TCTI spec libraries ###
-# tcti headers
-libtctidir = $(includedir)/tcti
-libtcti_HEADERS = $(srcdir)/include/tcti/*.h
-
# tcti device library
-lib_LTLIBRARIES += tcti/libtcti-device.la
+libtcti_device = tcti/libtcti-device.la
+tss2_HEADERS += $(srcdir)/include/tss2/tss2_tcti_device.h
+lib_LTLIBRARIES += $(libtcti_device)
+nodist_pkgconfig_DATA += lib/tcti-device.pc
+EXTRA_DIST += tcti/tcti_device.map lib/tcti-device.pc.in
tcti_libtcti_device_la_CFLAGS = $(AM_CFLAGS)
if HAVE_LD_VERSION_SCRIPT
@@ -118,14 +124,12 @@
tcti_libtcti_device_la_LIBADD = $(libmarshal) $(libutil)
tcti_libtcti_device_la_SOURCES = tcti/tcti_device.c
-nodist_pkgconfig_DATA += lib/tcti-device.pc
-EXTRA_DIST += \
- tcti/tcti_device.map \
- lib/tcti-device.pc.in
-
# tcti library for microsoft simulator
libtcti_mssim = tcti/libtcti-mssim.la
+tss2_HEADERS += $(srcdir)/include/tss2/tss2_tcti_mssim.h
lib_LTLIBRARIES += $(libtcti_mssim)
+nodist_pkgconfig_DATA += lib/tcti-mssim.pc
+EXTRA_DIST += lib/tcti-mssim.map lib/tcti-mssim.pc.in
tcti_libtcti_mssim_la_CFLAGS = $(AM_CFLAGS) $(URIPARSER_CFLAGS)
if HAVE_LD_VERSION_SCRIPT
@@ -134,46 +138,34 @@
tcti_libtcti_mssim_la_LIBADD = $(libmarshal) $(URIPARSER_LIBS) $(libutil)
tcti_libtcti_mssim_la_SOURCES = tcti/tcti-mssim.c tcti/sockets.c tcti/sockets.h
-nodist_pkgconfig_DATA += lib/tcti-mssim.pc
-EXTRA_DIST += lib/tcti-mssim.map lib/tcti-mssim.pc.in
-
### TCG TSS SAPI spec library ###
-# Headers
-libsapidir = $(includedir)/sapi
-libsapi_HEADERS = $(srcdir)/include/sapi/*.h
-
-# Library
libsapi = sysapi/libsapi.la
+tss2_HEADERS += $(srcdir)/include/tss2/tss2_sys.h
lib_LTLIBRARIES += $(libsapi)
+nodist_pkgconfig_DATA += lib/sapi.pc
+EXTRA_DIST += lib/sapi.pc.in
+
+sysapi_libsapi_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/marshal -I$(srcdir)/sysapi/include
sysapi_libsapi_la_LIBADD = $(libmarshal)
sysapi_libsapi_la_SOURCES = $(SYSAPI_C) $(SYSAPI_H) $(SYSAPIUTIL_C) \
$(SYSAPIUTIL_H)
-nodist_pkgconfig_DATA += lib/sapi.pc
-
-EXTRA_DIST += \
- lib/sapi.pc.in
-
### TCG TSS ESAPI spec library ###
if ESAPI
-# Headers
-libesapidir = $(includedir)/esapi
-libesapi_HEADERS = $(srcdir)/include/esapi/*.h
-
-# Library
libesapi = esapi/libesapi.la
+tss2_HEADERS += $(srcdir)/include/tss2/tss2_esys.h
lib_LTLIBRARIES += $(libesapi)
+nodist_pkgconfig_DATA += lib/esapi.pc
+EXTRA_DIST += lib/esapi.pc.in
+
esapi_libesapi_la_CFLAGS = $(AM_CFLAGS) -Wno-unused-variable -Wno-unused-label \
- -I. -I$(srcdir)/esapi/esapi -I$(srcdir)/include/esapi \
- -I$(srcdir)/esapi/esapi_util \
+ -I$(srcdir)/sysapi/include -I$(srcdir)/esapi/esapi_util \
-DESYS_TCTI_DEFAULT_MODULE=$(TCTI_DEFAULT_MODULE) \
-DESYS_TCTI_DEFAULT_CONFIG=$(TCTI_DEFAULT_CONFIG)
esapi_libesapi_la_LIBADD = $(libsapi) $(libmarshal) $(libtcti_device) $(libtcti_mssim) $(libutil)
esapi_libesapi_la_LDFLAGS = $(AM_LDFLAGS) -lgcrypt
esapi_libesapi_la_SOURCES = $(ESAPI_SRC)
-nodist_pkgconfig_DATA += lib/esapi.pc
-EXTRA_DIST += lib/esapi.pc.in
endif #ESAPI
### Man Pages
diff --git a/esapi/esapi/Esys_ActivateCredential.c b/esapi/esapi/Esys_ActivateCredential.c
index 0e57170..be62dd8 100644
--- a/esapi/esapi/Esys_ActivateCredential.c
+++ b/esapi/esapi/Esys_ActivateCredential.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_Certify.c b/esapi/esapi/Esys_Certify.c
index 511d2cb..fcde08c 100644
--- a/esapi/esapi/Esys_Certify.c
+++ b/esapi/esapi/Esys_Certify.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_CertifyCreation.c b/esapi/esapi/Esys_CertifyCreation.c
index 86cecc6..1892879 100644
--- a/esapi/esapi/Esys_CertifyCreation.c
+++ b/esapi/esapi/Esys_CertifyCreation.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_ChangeEPS.c b/esapi/esapi/Esys_ChangeEPS.c
index f24325f..f4b8a0a 100644
--- a/esapi/esapi/Esys_ChangeEPS.c
+++ b/esapi/esapi/Esys_ChangeEPS.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_ChangePPS.c b/esapi/esapi/Esys_ChangePPS.c
index 708ec58..9bb3bd6 100644
--- a/esapi/esapi/Esys_ChangePPS.c
+++ b/esapi/esapi/Esys_ChangePPS.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_Clear.c b/esapi/esapi/Esys_Clear.c
index 637d213..9a38139 100644
--- a/esapi/esapi/Esys_Clear.c
+++ b/esapi/esapi/Esys_Clear.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_ClearControl.c b/esapi/esapi/Esys_ClearControl.c
index 4635302..02a405b 100644
--- a/esapi/esapi/Esys_ClearControl.c
+++ b/esapi/esapi/Esys_ClearControl.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_ClockRateAdjust.c b/esapi/esapi/Esys_ClockRateAdjust.c
index 3499a62..bf2fe3c 100644
--- a/esapi/esapi/Esys_ClockRateAdjust.c
+++ b/esapi/esapi/Esys_ClockRateAdjust.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_ClockSet.c b/esapi/esapi/Esys_ClockSet.c
index cabf9c8..8386bf9 100644
--- a/esapi/esapi/Esys_ClockSet.c
+++ b/esapi/esapi/Esys_ClockSet.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_Commit.c b/esapi/esapi/Esys_Commit.c
index 0090660..ee2996c 100644
--- a/esapi/esapi/Esys_Commit.c
+++ b/esapi/esapi/Esys_Commit.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_ContextLoad.c b/esapi/esapi/Esys_ContextLoad.c
index 6020a65..0ea5039 100644
--- a/esapi/esapi/Esys_ContextLoad.c
+++ b/esapi/esapi/Esys_ContextLoad.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_ContextSave.c b/esapi/esapi/Esys_ContextSave.c
index 3d3f63e..27b4f38 100644
--- a/esapi/esapi/Esys_ContextSave.c
+++ b/esapi/esapi/Esys_ContextSave.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_Create.c b/esapi/esapi/Esys_Create.c
index b31e2ca..256344b 100644
--- a/esapi/esapi/Esys_Create.c
+++ b/esapi/esapi/Esys_Create.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_CreateLoaded.c b/esapi/esapi/Esys_CreateLoaded.c
index 64a0235..301e0d6 100644
--- a/esapi/esapi/Esys_CreateLoaded.c
+++ b/esapi/esapi/Esys_CreateLoaded.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_CreatePrimary.c b/esapi/esapi/Esys_CreatePrimary.c
index 411fbbb..560442c 100644
--- a/esapi/esapi/Esys_CreatePrimary.c
+++ b/esapi/esapi/Esys_CreatePrimary.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_DictionaryAttackLockReset.c b/esapi/esapi/Esys_DictionaryAttackLockReset.c
index 6f87e7f..907d1b9 100644
--- a/esapi/esapi/Esys_DictionaryAttackLockReset.c
+++ b/esapi/esapi/Esys_DictionaryAttackLockReset.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_DictionaryAttackParameters.c b/esapi/esapi/Esys_DictionaryAttackParameters.c
index 71d5b7b..46ad445 100644
--- a/esapi/esapi/Esys_DictionaryAttackParameters.c
+++ b/esapi/esapi/Esys_DictionaryAttackParameters.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_Duplicate.c b/esapi/esapi/Esys_Duplicate.c
index a1d7a10..f12c538 100644
--- a/esapi/esapi/Esys_Duplicate.c
+++ b/esapi/esapi/Esys_Duplicate.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_ECC_Parameters.c b/esapi/esapi/Esys_ECC_Parameters.c
index 9c2fc47..e65ec00 100644
--- a/esapi/esapi/Esys_ECC_Parameters.c
+++ b/esapi/esapi/Esys_ECC_Parameters.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_ECDH_KeyGen.c b/esapi/esapi/Esys_ECDH_KeyGen.c
index acb7212..5a62c4f 100644
--- a/esapi/esapi/Esys_ECDH_KeyGen.c
+++ b/esapi/esapi/Esys_ECDH_KeyGen.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_ECDH_ZGen.c b/esapi/esapi/Esys_ECDH_ZGen.c
index 76b9b09..f14029e 100644
--- a/esapi/esapi/Esys_ECDH_ZGen.c
+++ b/esapi/esapi/Esys_ECDH_ZGen.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_EC_Ephemeral.c b/esapi/esapi/Esys_EC_Ephemeral.c
index fe29ad9..da3a2d8 100644
--- a/esapi/esapi/Esys_EC_Ephemeral.c
+++ b/esapi/esapi/Esys_EC_Ephemeral.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_EncryptDecrypt.c b/esapi/esapi/Esys_EncryptDecrypt.c
index c2af6aa..b065c27 100644
--- a/esapi/esapi/Esys_EncryptDecrypt.c
+++ b/esapi/esapi/Esys_EncryptDecrypt.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_EncryptDecrypt2.c b/esapi/esapi/Esys_EncryptDecrypt2.c
index b450409..89b6010 100644
--- a/esapi/esapi/Esys_EncryptDecrypt2.c
+++ b/esapi/esapi/Esys_EncryptDecrypt2.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_EventSequenceComplete.c b/esapi/esapi/Esys_EventSequenceComplete.c
index 773f201..9c733bb 100644
--- a/esapi/esapi/Esys_EventSequenceComplete.c
+++ b/esapi/esapi/Esys_EventSequenceComplete.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_EvictControl.c b/esapi/esapi/Esys_EvictControl.c
index d94acb3..9c239e4 100644
--- a/esapi/esapi/Esys_EvictControl.c
+++ b/esapi/esapi/Esys_EvictControl.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_FieldUpgradeData.c b/esapi/esapi/Esys_FieldUpgradeData.c
index de2355a..c074451 100644
--- a/esapi/esapi/Esys_FieldUpgradeData.c
+++ b/esapi/esapi/Esys_FieldUpgradeData.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_FieldUpgradeStart.c b/esapi/esapi/Esys_FieldUpgradeStart.c
index a077e1b..6b13803 100644
--- a/esapi/esapi/Esys_FieldUpgradeStart.c
+++ b/esapi/esapi/Esys_FieldUpgradeStart.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_FirmwareRead.c b/esapi/esapi/Esys_FirmwareRead.c
index 51c2c33..f7135e8 100644
--- a/esapi/esapi/Esys_FirmwareRead.c
+++ b/esapi/esapi/Esys_FirmwareRead.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_FlushContext.c b/esapi/esapi/Esys_FlushContext.c
index 6fecb64..e3b424d 100644
--- a/esapi/esapi/Esys_FlushContext.c
+++ b/esapi/esapi/Esys_FlushContext.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_GetCapability.c b/esapi/esapi/Esys_GetCapability.c
index e6ac68a..3eb6e7e 100644
--- a/esapi/esapi/Esys_GetCapability.c
+++ b/esapi/esapi/Esys_GetCapability.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_GetCommandAuditDigest.c b/esapi/esapi/Esys_GetCommandAuditDigest.c
index 196a654..e70de9f 100644
--- a/esapi/esapi/Esys_GetCommandAuditDigest.c
+++ b/esapi/esapi/Esys_GetCommandAuditDigest.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_GetRandom.c b/esapi/esapi/Esys_GetRandom.c
index 5a6ad96..8f0aa8f 100644
--- a/esapi/esapi/Esys_GetRandom.c
+++ b/esapi/esapi/Esys_GetRandom.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_GetSessionAuditDigest.c b/esapi/esapi/Esys_GetSessionAuditDigest.c
index c361afc..4337626 100644
--- a/esapi/esapi/Esys_GetSessionAuditDigest.c
+++ b/esapi/esapi/Esys_GetSessionAuditDigest.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_GetTestResult.c b/esapi/esapi/Esys_GetTestResult.c
index 713cb48..7f0e898 100644
--- a/esapi/esapi/Esys_GetTestResult.c
+++ b/esapi/esapi/Esys_GetTestResult.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_GetTime.c b/esapi/esapi/Esys_GetTime.c
index 2da89c1..6e20a20 100644
--- a/esapi/esapi/Esys_GetTime.c
+++ b/esapi/esapi/Esys_GetTime.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_HMAC.c b/esapi/esapi/Esys_HMAC.c
index 57a6cd3..0dcc129 100644
--- a/esapi/esapi/Esys_HMAC.c
+++ b/esapi/esapi/Esys_HMAC.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_HMAC_Start.c b/esapi/esapi/Esys_HMAC_Start.c
index f2b6475..d764632 100644
--- a/esapi/esapi/Esys_HMAC_Start.c
+++ b/esapi/esapi/Esys_HMAC_Start.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_Hash.c b/esapi/esapi/Esys_Hash.c
index 696ff4a..4a33cf2 100644
--- a/esapi/esapi/Esys_Hash.c
+++ b/esapi/esapi/Esys_Hash.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_HashSequenceStart.c b/esapi/esapi/Esys_HashSequenceStart.c
index abcc92d..4084277 100644
--- a/esapi/esapi/Esys_HashSequenceStart.c
+++ b/esapi/esapi/Esys_HashSequenceStart.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_HierarchyChangeAuth.c b/esapi/esapi/Esys_HierarchyChangeAuth.c
index 9b87b99..847551a 100644
--- a/esapi/esapi/Esys_HierarchyChangeAuth.c
+++ b/esapi/esapi/Esys_HierarchyChangeAuth.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_HierarchyControl.c b/esapi/esapi/Esys_HierarchyControl.c
index 0c1fd93..77e2ecb 100644
--- a/esapi/esapi/Esys_HierarchyControl.c
+++ b/esapi/esapi/Esys_HierarchyControl.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_Import.c b/esapi/esapi/Esys_Import.c
index 5a5ef9e..72f5fef 100644
--- a/esapi/esapi/Esys_Import.c
+++ b/esapi/esapi/Esys_Import.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_IncrementalSelfTest.c b/esapi/esapi/Esys_IncrementalSelfTest.c
index e999036..fd47a3c 100644
--- a/esapi/esapi/Esys_IncrementalSelfTest.c
+++ b/esapi/esapi/Esys_IncrementalSelfTest.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_Load.c b/esapi/esapi/Esys_Load.c
index 9348c38..aa3bcdb 100644
--- a/esapi/esapi/Esys_Load.c
+++ b/esapi/esapi/Esys_Load.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_LoadExternal.c b/esapi/esapi/Esys_LoadExternal.c
index 9bd5bd6..0155c71 100644
--- a/esapi/esapi/Esys_LoadExternal.c
+++ b/esapi/esapi/Esys_LoadExternal.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_MakeCredential.c b/esapi/esapi/Esys_MakeCredential.c
index eff26a8..b5729e7 100644
--- a/esapi/esapi/Esys_MakeCredential.c
+++ b/esapi/esapi/Esys_MakeCredential.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_NV_Certify.c b/esapi/esapi/Esys_NV_Certify.c
index 56cb028..b201b7a 100644
--- a/esapi/esapi/Esys_NV_Certify.c
+++ b/esapi/esapi/Esys_NV_Certify.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_NV_ChangeAuth.c b/esapi/esapi/Esys_NV_ChangeAuth.c
index 713d137..b69ec5e 100644
--- a/esapi/esapi/Esys_NV_ChangeAuth.c
+++ b/esapi/esapi/Esys_NV_ChangeAuth.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_NV_DefineSpace.c b/esapi/esapi/Esys_NV_DefineSpace.c
index d817bdc..b76cea9 100644
--- a/esapi/esapi/Esys_NV_DefineSpace.c
+++ b/esapi/esapi/Esys_NV_DefineSpace.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_NV_Extend.c b/esapi/esapi/Esys_NV_Extend.c
index eda3ed0..92d45aa 100644
--- a/esapi/esapi/Esys_NV_Extend.c
+++ b/esapi/esapi/Esys_NV_Extend.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_NV_GlobalWriteLock.c b/esapi/esapi/Esys_NV_GlobalWriteLock.c
index 03d11ad..d58df13 100644
--- a/esapi/esapi/Esys_NV_GlobalWriteLock.c
+++ b/esapi/esapi/Esys_NV_GlobalWriteLock.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_NV_Increment.c b/esapi/esapi/Esys_NV_Increment.c
index 01e7bd0..df178fb 100644
--- a/esapi/esapi/Esys_NV_Increment.c
+++ b/esapi/esapi/Esys_NV_Increment.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_NV_Read.c b/esapi/esapi/Esys_NV_Read.c
index 71fd396..e386510 100644
--- a/esapi/esapi/Esys_NV_Read.c
+++ b/esapi/esapi/Esys_NV_Read.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_NV_ReadLock.c b/esapi/esapi/Esys_NV_ReadLock.c
index d9f16a0..b47274c 100644
--- a/esapi/esapi/Esys_NV_ReadLock.c
+++ b/esapi/esapi/Esys_NV_ReadLock.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_NV_ReadPublic.c b/esapi/esapi/Esys_NV_ReadPublic.c
index b0022e7..53a054c 100644
--- a/esapi/esapi/Esys_NV_ReadPublic.c
+++ b/esapi/esapi/Esys_NV_ReadPublic.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_NV_SetBits.c b/esapi/esapi/Esys_NV_SetBits.c
index 7997849..1ae5be6 100644
--- a/esapi/esapi/Esys_NV_SetBits.c
+++ b/esapi/esapi/Esys_NV_SetBits.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_NV_UndefineSpace.c b/esapi/esapi/Esys_NV_UndefineSpace.c
index 05f4e14..ad1170c 100644
--- a/esapi/esapi/Esys_NV_UndefineSpace.c
+++ b/esapi/esapi/Esys_NV_UndefineSpace.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_NV_UndefineSpaceSpecial.c b/esapi/esapi/Esys_NV_UndefineSpaceSpecial.c
index 600531a..f81eed0 100644
--- a/esapi/esapi/Esys_NV_UndefineSpaceSpecial.c
+++ b/esapi/esapi/Esys_NV_UndefineSpaceSpecial.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_NV_Write.c b/esapi/esapi/Esys_NV_Write.c
index 5a1af97..81d01e7 100644
--- a/esapi/esapi/Esys_NV_Write.c
+++ b/esapi/esapi/Esys_NV_Write.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_NV_WriteLock.c b/esapi/esapi/Esys_NV_WriteLock.c
index 322c691..76237e6 100644
--- a/esapi/esapi/Esys_NV_WriteLock.c
+++ b/esapi/esapi/Esys_NV_WriteLock.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_ObjectChangeAuth.c b/esapi/esapi/Esys_ObjectChangeAuth.c
index 5989aa6..97fb375 100644
--- a/esapi/esapi/Esys_ObjectChangeAuth.c
+++ b/esapi/esapi/Esys_ObjectChangeAuth.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PCR_Allocate.c b/esapi/esapi/Esys_PCR_Allocate.c
index c77be62..8bdd8ff 100644
--- a/esapi/esapi/Esys_PCR_Allocate.c
+++ b/esapi/esapi/Esys_PCR_Allocate.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PCR_Event.c b/esapi/esapi/Esys_PCR_Event.c
index 183bf97..bf0ddad 100644
--- a/esapi/esapi/Esys_PCR_Event.c
+++ b/esapi/esapi/Esys_PCR_Event.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PCR_Extend.c b/esapi/esapi/Esys_PCR_Extend.c
index 9b5a103..3278e5e 100644
--- a/esapi/esapi/Esys_PCR_Extend.c
+++ b/esapi/esapi/Esys_PCR_Extend.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PCR_Read.c b/esapi/esapi/Esys_PCR_Read.c
index dee8cce..569e363 100644
--- a/esapi/esapi/Esys_PCR_Read.c
+++ b/esapi/esapi/Esys_PCR_Read.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PCR_Reset.c b/esapi/esapi/Esys_PCR_Reset.c
index 94fbef8..e49ca2b 100644
--- a/esapi/esapi/Esys_PCR_Reset.c
+++ b/esapi/esapi/Esys_PCR_Reset.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PCR_SetAuthPolicy.c b/esapi/esapi/Esys_PCR_SetAuthPolicy.c
index 7fa564a..af78d15 100644
--- a/esapi/esapi/Esys_PCR_SetAuthPolicy.c
+++ b/esapi/esapi/Esys_PCR_SetAuthPolicy.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PCR_SetAuthValue.c b/esapi/esapi/Esys_PCR_SetAuthValue.c
index 3cf590a..2433ef0 100644
--- a/esapi/esapi/Esys_PCR_SetAuthValue.c
+++ b/esapi/esapi/Esys_PCR_SetAuthValue.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PP_Commands.c b/esapi/esapi/Esys_PP_Commands.c
index 5fc09ac..18ffb51 100644
--- a/esapi/esapi/Esys_PP_Commands.c
+++ b/esapi/esapi/Esys_PP_Commands.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PolicyAuthValue.c b/esapi/esapi/Esys_PolicyAuthValue.c
index 6091b15..a42fbd0 100644
--- a/esapi/esapi/Esys_PolicyAuthValue.c
+++ b/esapi/esapi/Esys_PolicyAuthValue.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PolicyAuthorize.c b/esapi/esapi/Esys_PolicyAuthorize.c
index f11e996..f89e319 100644
--- a/esapi/esapi/Esys_PolicyAuthorize.c
+++ b/esapi/esapi/Esys_PolicyAuthorize.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PolicyAuthorizeNV.c b/esapi/esapi/Esys_PolicyAuthorizeNV.c
index 17d3e1b..46c5e7c 100644
--- a/esapi/esapi/Esys_PolicyAuthorizeNV.c
+++ b/esapi/esapi/Esys_PolicyAuthorizeNV.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PolicyCommandCode.c b/esapi/esapi/Esys_PolicyCommandCode.c
index 5e0280a..1a84000 100644
--- a/esapi/esapi/Esys_PolicyCommandCode.c
+++ b/esapi/esapi/Esys_PolicyCommandCode.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PolicyCounterTimer.c b/esapi/esapi/Esys_PolicyCounterTimer.c
index b339d49..472a8d8 100644
--- a/esapi/esapi/Esys_PolicyCounterTimer.c
+++ b/esapi/esapi/Esys_PolicyCounterTimer.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PolicyCpHash.c b/esapi/esapi/Esys_PolicyCpHash.c
index 5244455..bad904c 100644
--- a/esapi/esapi/Esys_PolicyCpHash.c
+++ b/esapi/esapi/Esys_PolicyCpHash.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PolicyDuplicationSelect.c b/esapi/esapi/Esys_PolicyDuplicationSelect.c
index 07a66e1..346dc45 100644
--- a/esapi/esapi/Esys_PolicyDuplicationSelect.c
+++ b/esapi/esapi/Esys_PolicyDuplicationSelect.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PolicyGetDigest.c b/esapi/esapi/Esys_PolicyGetDigest.c
index 207f87c..bcbd3e4 100644
--- a/esapi/esapi/Esys_PolicyGetDigest.c
+++ b/esapi/esapi/Esys_PolicyGetDigest.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PolicyLocality.c b/esapi/esapi/Esys_PolicyLocality.c
index d833ddb..8f0954d 100644
--- a/esapi/esapi/Esys_PolicyLocality.c
+++ b/esapi/esapi/Esys_PolicyLocality.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PolicyNV.c b/esapi/esapi/Esys_PolicyNV.c
index 9940d75..0b08428 100644
--- a/esapi/esapi/Esys_PolicyNV.c
+++ b/esapi/esapi/Esys_PolicyNV.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PolicyNameHash.c b/esapi/esapi/Esys_PolicyNameHash.c
index 93f07f6..a0b6af3 100644
--- a/esapi/esapi/Esys_PolicyNameHash.c
+++ b/esapi/esapi/Esys_PolicyNameHash.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PolicyNvWritten.c b/esapi/esapi/Esys_PolicyNvWritten.c
index 1c35739..9bfaf1c 100644
--- a/esapi/esapi/Esys_PolicyNvWritten.c
+++ b/esapi/esapi/Esys_PolicyNvWritten.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PolicyOR.c b/esapi/esapi/Esys_PolicyOR.c
index 032c39e..6e8c64b 100644
--- a/esapi/esapi/Esys_PolicyOR.c
+++ b/esapi/esapi/Esys_PolicyOR.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PolicyPCR.c b/esapi/esapi/Esys_PolicyPCR.c
index a95eb4c..c722944 100644
--- a/esapi/esapi/Esys_PolicyPCR.c
+++ b/esapi/esapi/Esys_PolicyPCR.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PolicyPassword.c b/esapi/esapi/Esys_PolicyPassword.c
index 2f02160..633fe04 100644
--- a/esapi/esapi/Esys_PolicyPassword.c
+++ b/esapi/esapi/Esys_PolicyPassword.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PolicyPhysicalPresence.c b/esapi/esapi/Esys_PolicyPhysicalPresence.c
index 51e3f33..7679972 100644
--- a/esapi/esapi/Esys_PolicyPhysicalPresence.c
+++ b/esapi/esapi/Esys_PolicyPhysicalPresence.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PolicyRestart.c b/esapi/esapi/Esys_PolicyRestart.c
index c50f5a9..a491663 100644
--- a/esapi/esapi/Esys_PolicyRestart.c
+++ b/esapi/esapi/Esys_PolicyRestart.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PolicySecret.c b/esapi/esapi/Esys_PolicySecret.c
index 0199dea..ff42ca6 100644
--- a/esapi/esapi/Esys_PolicySecret.c
+++ b/esapi/esapi/Esys_PolicySecret.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PolicySigned.c b/esapi/esapi/Esys_PolicySigned.c
index de8b9cc..80847aa 100644
--- a/esapi/esapi/Esys_PolicySigned.c
+++ b/esapi/esapi/Esys_PolicySigned.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PolicyTemplate.c b/esapi/esapi/Esys_PolicyTemplate.c
index 30952ab..db1de53 100644
--- a/esapi/esapi/Esys_PolicyTemplate.c
+++ b/esapi/esapi/Esys_PolicyTemplate.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_PolicyTicket.c b/esapi/esapi/Esys_PolicyTicket.c
index 384c281..dab1f4e 100644
--- a/esapi/esapi/Esys_PolicyTicket.c
+++ b/esapi/esapi/Esys_PolicyTicket.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_Quote.c b/esapi/esapi/Esys_Quote.c
index fd680b2..46f56de 100644
--- a/esapi/esapi/Esys_Quote.c
+++ b/esapi/esapi/Esys_Quote.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_RSA_Decrypt.c b/esapi/esapi/Esys_RSA_Decrypt.c
index c5bb983..726b424 100644
--- a/esapi/esapi/Esys_RSA_Decrypt.c
+++ b/esapi/esapi/Esys_RSA_Decrypt.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_RSA_Encrypt.c b/esapi/esapi/Esys_RSA_Encrypt.c
index bdea362..83ca972 100644
--- a/esapi/esapi/Esys_RSA_Encrypt.c
+++ b/esapi/esapi/Esys_RSA_Encrypt.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_ReadClock.c b/esapi/esapi/Esys_ReadClock.c
index ba992ac..03a5332 100644
--- a/esapi/esapi/Esys_ReadClock.c
+++ b/esapi/esapi/Esys_ReadClock.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_ReadPublic.c b/esapi/esapi/Esys_ReadPublic.c
index 549b73c..b66d9d4 100644
--- a/esapi/esapi/Esys_ReadPublic.c
+++ b/esapi/esapi/Esys_ReadPublic.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_Rewrap.c b/esapi/esapi/Esys_Rewrap.c
index 4204fda..6b42a28 100644
--- a/esapi/esapi/Esys_Rewrap.c
+++ b/esapi/esapi/Esys_Rewrap.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_SelfTest.c b/esapi/esapi/Esys_SelfTest.c
index 950e908..e4f068a 100644
--- a/esapi/esapi/Esys_SelfTest.c
+++ b/esapi/esapi/Esys_SelfTest.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_SequenceComplete.c b/esapi/esapi/Esys_SequenceComplete.c
index e2829db..1bebfb3 100644
--- a/esapi/esapi/Esys_SequenceComplete.c
+++ b/esapi/esapi/Esys_SequenceComplete.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_SequenceUpdate.c b/esapi/esapi/Esys_SequenceUpdate.c
index b9bda43..2829353 100644
--- a/esapi/esapi/Esys_SequenceUpdate.c
+++ b/esapi/esapi/Esys_SequenceUpdate.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_SetAlgorithmSet.c b/esapi/esapi/Esys_SetAlgorithmSet.c
index bff11c9..951e9dc 100644
--- a/esapi/esapi/Esys_SetAlgorithmSet.c
+++ b/esapi/esapi/Esys_SetAlgorithmSet.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_SetCommandCodeAuditStatus.c b/esapi/esapi/Esys_SetCommandCodeAuditStatus.c
index 35eadd3..9f2218c 100644
--- a/esapi/esapi/Esys_SetCommandCodeAuditStatus.c
+++ b/esapi/esapi/Esys_SetCommandCodeAuditStatus.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_SetPrimaryPolicy.c b/esapi/esapi/Esys_SetPrimaryPolicy.c
index 505479d..d5065e1 100644
--- a/esapi/esapi/Esys_SetPrimaryPolicy.c
+++ b/esapi/esapi/Esys_SetPrimaryPolicy.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_Shutdown.c b/esapi/esapi/Esys_Shutdown.c
index ac633a7..81a5436 100644
--- a/esapi/esapi/Esys_Shutdown.c
+++ b/esapi/esapi/Esys_Shutdown.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_Sign.c b/esapi/esapi/Esys_Sign.c
index ccc1382..fd6c9ec 100644
--- a/esapi/esapi/Esys_Sign.c
+++ b/esapi/esapi/Esys_Sign.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_StartAuthSession.c b/esapi/esapi/Esys_StartAuthSession.c
index 37120c7..293a925 100644
--- a/esapi/esapi/Esys_StartAuthSession.c
+++ b/esapi/esapi/Esys_StartAuthSession.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_Startup.c b/esapi/esapi/Esys_Startup.c
index 6b45547..bc55a7c 100644
--- a/esapi/esapi/Esys_Startup.c
+++ b/esapi/esapi/Esys_Startup.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_StirRandom.c b/esapi/esapi/Esys_StirRandom.c
index dec9917..d1f8f99 100644
--- a/esapi/esapi/Esys_StirRandom.c
+++ b/esapi/esapi/Esys_StirRandom.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_TestParms.c b/esapi/esapi/Esys_TestParms.c
index e072b7e..38956cf 100644
--- a/esapi/esapi/Esys_TestParms.c
+++ b/esapi/esapi/Esys_TestParms.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_Unseal.c b/esapi/esapi/Esys_Unseal.c
index a63b9cc..aae5135 100644
--- a/esapi/esapi/Esys_Unseal.c
+++ b/esapi/esapi/Esys_Unseal.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_Vendor_TCG_Test.c b/esapi/esapi/Esys_Vendor_TCG_Test.c
index 9dd0e61..4beefae 100644
--- a/esapi/esapi/Esys_Vendor_TCG_Test.c
+++ b/esapi/esapi/Esys_Vendor_TCG_Test.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_VerifySignature.c b/esapi/esapi/Esys_VerifySignature.c
index 522007e..143d5b7 100644
--- a/esapi/esapi/Esys_VerifySignature.c
+++ b/esapi/esapi/Esys_VerifySignature.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/Esys_ZGen_2Phase.c b/esapi/esapi/Esys_ZGen_2Phase.c
index d5586e1..c0d37e7 100644
--- a/esapi/esapi/Esys_ZGen_2Phase.c
+++ b/esapi/esapi/Esys_ZGen_2Phase.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/esapi/esapi/esys_context.c b/esapi/esapi/esys_context.c
index b3582ca..c41a04c 100644
--- a/esapi/esapi/esys_context.c
+++ b/esapi/esapi/esys_context.c
@@ -24,12 +24,12 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
-#include <sapi/tss2_sys.h>
-#include <sysapi_util.h>
+#include "tss2_sys.h"
+#include "sysapi_util.h"
#include <tss2_esys.h>
#include "esys_types.h"
#include "esys_crypto.h"
diff --git a/esapi/esapi/esys_tcti_default.c b/esapi/esapi/esys_tcti_default.c
index 4575ba6..f0e0c39 100644
--- a/esapi/esapi/esys_tcti_default.c
+++ b/esapi/esapi/esys_tcti_default.c
@@ -1,6 +1,6 @@
-#include "sapi/tpm20.h"
-#include "tcti/tcti_device.h"
-#include "tcti/tcti_mssim.h"
+#include "tpm20.h"
+#include "tss2_tcti_device.h"
+#include "tss2_tcti_mssim.h"
#include <errno.h>
#include <stdio.h>
#include <string.h>
diff --git a/esapi/esapi/esys_tr.c b/esapi/esapi/esys_tr.c
index 754f55d..bf2b1de 100644
--- a/esapi/esapi/esys_tr.c
+++ b/esapi/esapi/esys_tr.c
@@ -24,13 +24,13 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
-#include <sapi/tss2_sys.h>
-#include <sapi/tss2_sys.h>
-#include <sysapi_util.h>
+#include "tss2_sys.h"
+#include "tss2_sys.h"
+#include "sysapi_util.h"
#include "esys_types.h"
#include "esys_crypto.h"
#include <tss2_esys.h>
diff --git a/esapi/esapi_util/esys_crypto.c b/esapi/esapi_util/esys_crypto.c
index a1698b4..56b7645 100644
--- a/esapi/esapi_util/esys_crypto.c
+++ b/esapi/esapi_util/esys_crypto.c
@@ -24,13 +24,13 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
-#include <sapi/tss2_sys.h>
-#include <sysapi_util.h>
+#include "tss2_sys.h"
+#include "sysapi_util.h"
#define LOGMODULE sys
#include "log/log.h"
diff --git a/esapi/esapi_util/esys_crypto.h b/esapi/esapi_util/esys_crypto.h
index fdae355..275b2dc 100644
--- a/esapi/esapi_util/esys_crypto.h
+++ b/esapi/esapi_util/esys_crypto.h
@@ -27,14 +27,14 @@
#ifndef ESYS_CRYPTO_H
#define ESYS_CRYPTO_H
-#include <sapi/tss2_common.h>
+#include "tss2_common.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include <stdint.h>
#include <stddef.h>
-#include <sapi/tss2_tpm2_types.h>
+#include "tss2_tpm2_types.h"
#include <stdarg.h>
diff --git a/esapi/esapi_util/esys_int.h b/esapi/esapi_util/esys_int.h
index 69dc643..785f262 100644
--- a/esapi/esapi_util/esys_int.h
+++ b/esapi/esapi_util/esys_int.h
@@ -27,7 +27,7 @@
#ifndef ESYS_INT_H
#define ESYS_INT_H
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#include <stdbool.h>
#include <tss2_esys.h>
#include "esys_types.h"
diff --git a/esapi/esapi_util/esys_iutil.c b/esapi/esapi_util/esys_iutil.c
index cf833c9..fe70019 100644
--- a/esapi/esapi_util/esys_iutil.c
+++ b/esapi/esapi_util/esys_iutil.c
@@ -24,7 +24,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#include "esys_iutil.h"
#include "tss2_esys.h"
#include "esys_mu.h"
diff --git a/esapi/esapi_util/esys_mu.c b/esapi/esapi_util/esys_mu.c
index 4f7e311..854b2fd 100644
--- a/esapi/esapi_util/esys_mu.c
+++ b/esapi/esapi_util/esys_mu.c
@@ -31,13 +31,13 @@
#define _SVID_SOURCE 1
#endif
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
-#include <sysapi_util.h>
-#include <sapi/tss2_mu.h>
+#include "sysapi_util.h"
+#include "tss2_mu.h"
#include <inttypes.h>
#include "tss2_esys.h"
diff --git a/esapi/esapi_util/esys_mu.h b/esapi/esapi_util/esys_mu.h
index ad6cb05..f1f9bd8 100644
--- a/esapi/esapi_util/esys_mu.h
+++ b/esapi/esapi_util/esys_mu.h
@@ -27,13 +27,13 @@
#ifndef ESYS_MU_H
#define ESYS_MU_H
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#include <stdlib.h>
#include <stdio.h>
#include <inttypes.h>
#include <stdbool.h>
#include "esys_types.h"
-#include "sapi/tss2_mu.h"
+#include "tss2_mu.h"
#ifndef FALSE
#define FALSE 0
#endif
diff --git a/include/sapi/tpm20.h b/include/tss2/tpm20.h
similarity index 91%
rename from include/sapi/tpm20.h
rename to include/tss2/tpm20.h
index 1089055..ed4724f 100644
--- a/include/sapi/tpm20.h
+++ b/include/tss2/tpm20.h
@@ -35,9 +35,9 @@
#include <stdlib.h>
#include <string.h>
-#include "sapi/tss2_common.h"
-#include "sapi/tss2_tpm2_types.h"
-#include "sapi/tss2_tcti.h"
-#include "sapi/tss2_sys.h"
-#include "sapi/tss2_mu.h"
+#include "tss2_common.h"
+#include "tss2_tpm2_types.h"
+#include "tss2_tcti.h"
+#include "tss2_sys.h"
+#include "tss2_mu.h"
#endif
diff --git a/include/sapi/tss2_common.h b/include/tss2/tss2_common.h
similarity index 100%
rename from include/sapi/tss2_common.h
rename to include/tss2/tss2_common.h
diff --git a/include/esapi/tss2_esys.h b/include/tss2/tss2_esys.h
similarity index 99%
rename from include/esapi/tss2_esys.h
rename to include/tss2/tss2_esys.h
index 9d8c91d..afe1902 100644
--- a/include/esapi/tss2_esys.h
+++ b/include/tss2/tss2_esys.h
@@ -26,11 +26,11 @@
*******************************************************************************/
#ifndef TSS2_ESYS_H
#define TSS2_ESYS_H
-#include <sapi/tpm20.h>
-#include <sapi/tss2_tcti.h>
-#include <sapi/tss2_sys.h>
#include <stdbool.h>
+#include "tss2_tcti.h"
+#include "tss2_sys.h"
+
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/include/sapi/tss2_mu.h b/include/tss2/tss2_mu.h
similarity index 100%
rename from include/sapi/tss2_mu.h
rename to include/tss2/tss2_mu.h
diff --git a/include/sapi/tss2_sys.h b/include/tss2/tss2_sys.h
similarity index 100%
rename from include/sapi/tss2_sys.h
rename to include/tss2/tss2_sys.h
diff --git a/include/sapi/tss2_tcti.h b/include/tss2/tss2_tcti.h
similarity index 100%
rename from include/sapi/tss2_tcti.h
rename to include/tss2/tss2_tcti.h
diff --git a/include/tcti/tcti_device.h b/include/tss2/tss2_tcti_device.h
similarity index 97%
rename from include/tcti/tcti_device.h
rename to include/tss2/tss2_tcti_device.h
index 9c6baca..e3f3bd5 100644
--- a/include/tcti/tcti_device.h
+++ b/include/tss2/tss2_tcti_device.h
@@ -27,7 +27,7 @@
#ifndef TCTI_DEVICE_H
#define TCTI_DEVICE_H
-#include <sapi/tss2_tcti.h>
+#include "tss2_tcti.h"
#ifdef __cplusplus
extern "C" {
diff --git a/include/tcti/tcti_mssim.h b/include/tss2/tss2_tcti_mssim.h
similarity index 98%
rename from include/tcti/tcti_mssim.h
rename to include/tss2/tss2_tcti_mssim.h
index 74e18e3..c30bce3 100644
--- a/include/tcti/tcti_mssim.h
+++ b/include/tss2/tss2_tcti_mssim.h
@@ -27,7 +27,7 @@
#ifndef TCTI_SOCKET_H
#define TCTI_SOCKET_H
-#include <sapi/tss2_tcti.h>
+#include "tss2_tcti.h"
/*
* Command codes that may be sent to simulator through out of band command
diff --git a/include/sapi/tss2_tpm2_types.h b/include/tss2/tss2_tpm2_types.h
similarity index 100%
rename from include/sapi/tss2_tpm2_types.h
rename to include/tss2/tss2_tpm2_types.h
diff --git a/marshal/base-types.c b/marshal/base-types.c
index 2f5100c..500b841 100644
--- a/marshal/base-types.c
+++ b/marshal/base-types.c
@@ -29,8 +29,8 @@
#include <inttypes.h>
#include <string.h>
-#include "sapi/tss2_mu.h"
-#include "sapi/tpm20.h"
+#include "tss2_mu.h"
+#include "tpm20.h"
#include "tss2_endian.h"
#define LOGMODULE marshal
#include "log/log.h"
diff --git a/marshal/tpm2b-types.c b/marshal/tpm2b-types.c
index a4b7b3e..49c044f 100644
--- a/marshal/tpm2b-types.c
+++ b/marshal/tpm2b-types.c
@@ -29,8 +29,8 @@
#include <inttypes.h>
#include <string.h>
-#include "sapi/tss2_mu.h"
-#include "sapi/tpm20.h"
+#include "tss2_mu.h"
+#include "tpm20.h"
#include "tss2_endian.h"
#define LOGMODULE marshal
#include "log/log.h"
diff --git a/marshal/tpma-types.c b/marshal/tpma-types.c
index 0c0ca36..e6ecc3d 100644
--- a/marshal/tpma-types.c
+++ b/marshal/tpma-types.c
@@ -29,8 +29,8 @@
#include <inttypes.h>
#include <string.h>
-#include "sapi/tss2_mu.h"
-#include "sapi/tpm20.h"
+#include "tss2_mu.h"
+#include "tpm20.h"
#include "tss2_endian.h"
#define LOGMODULE marshal
#include "log/log.h"
diff --git a/marshal/tpml-types.c b/marshal/tpml-types.c
index dfeb2b5..124d3d1 100644
--- a/marshal/tpml-types.c
+++ b/marshal/tpml-types.c
@@ -29,8 +29,8 @@
#include <inttypes.h>
#include <string.h>
-#include "sapi/tss2_mu.h"
-#include "sapi/tpm20.h"
+#include "tss2_mu.h"
+#include "tpm20.h"
#include "tss2_endian.h"
#define LOGMODULE marshal
#include "log/log.h"
diff --git a/marshal/tpms-types.c b/marshal/tpms-types.c
index a8dbd2e..75e0772 100644
--- a/marshal/tpms-types.c
+++ b/marshal/tpms-types.c
@@ -29,8 +29,8 @@
#include <inttypes.h>
#include <string.h>
-#include "sapi/tss2_mu.h"
-#include "sapi/tpm20.h"
+#include "tss2_mu.h"
+#include "tpm20.h"
#include "tss2_endian.h"
#define LOGMODULE marshal
#include "log/log.h"
diff --git a/marshal/tpmt-types.c b/marshal/tpmt-types.c
index 0c28441..8265a0a 100644
--- a/marshal/tpmt-types.c
+++ b/marshal/tpmt-types.c
@@ -29,8 +29,8 @@
#include <inttypes.h>
#include <string.h>
-#include "sapi/tss2_mu.h"
-#include "sapi/tpm20.h"
+#include "tss2_mu.h"
+#include "tpm20.h"
#include "tss2_endian.h"
#define LOGMODULE marshal
#include "log/log.h"
diff --git a/marshal/tpmu-types.c b/marshal/tpmu-types.c
index afb9a85..2078798 100644
--- a/marshal/tpmu-types.c
+++ b/marshal/tpmu-types.c
@@ -29,8 +29,8 @@
#include <inttypes.h>
#include <string.h>
-#include "sapi/tss2_mu.h"
-#include "sapi/tpm20.h"
+#include "tss2_mu.h"
+#include "tpm20.h"
#include "tss2_endian.h"
#define LOGMODULE marshal
#include "log/log.h"
diff --git a/marshal/tss2-mu.vcxproj b/marshal/tss2-mu.vcxproj
index 7cd2f1d..2cc1f3d 100644
--- a/marshal/tss2-mu.vcxproj
+++ b/marshal/tss2-mu.vcxproj
@@ -65,9 +65,9 @@
<ImportGroup Label="Shared" />
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>$(Configuration)\</OutDir>
- <IntDir>$(Configuration)\</IntDir>
+ <PropertyGroup>
+ <OutDir>$(SolutionDir)\$(Configuration)\$(Platform)\</OutDir>
+ <IntDir>$(SolutionDir)\$(Configuration)\$(Platform)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
@@ -75,14 +75,12 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_USRDLL;libtss2_mu_EXPORTS;MAXLOGLEVEL=3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_DEBUG;_WINDOWS;_USRDLL;libtss2_mu_EXPORTS;MAXLOGLEVEL=6;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NDEBUG;_WINDOWS;_USRDLL;libtss2_mu_EXPORTS;MAXLOGLEVEL=3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\include;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\include\tss2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ModuleDefinitionFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\tss2-mu.def</ModuleDefinitionFile>
- <ModuleDefinitionFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\tss2-mu.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(SolutionDir)\lib\tss2-mu.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/sysapi/sysapi/ContextManagement.c b/sysapi/sysapi/ContextManagement.c
index ee73884..0b81bf5 100644
--- a/sysapi/sysapi/ContextManagement.c
+++ b/sysapi/sysapi/ContextManagement.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
size_t Tss2_Sys_GetContextSize(size_t maxCommandSize)
diff --git a/sysapi/sysapi/DecryptParam.c b/sysapi/sysapi/DecryptParam.c
index 3d09265..48c3a77 100644
--- a/sysapi/sysapi/DecryptParam.c
+++ b/sysapi/sysapi/DecryptParam.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
#include "tss2_endian.h"
diff --git a/sysapi/sysapi/EncryptParam.c b/sysapi/sysapi/EncryptParam.c
index d12cc38..5848d6a 100644
--- a/sysapi/sysapi/EncryptParam.c
+++ b/sysapi/sysapi/EncryptParam.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
#include "tss2_endian.h"
diff --git a/sysapi/sysapi/GetCommandCode.c b/sysapi/sysapi/GetCommandCode.c
index 8d7ff42..44ea482 100644
--- a/sysapi/sysapi/GetCommandCode.c
+++ b/sysapi/sysapi/GetCommandCode.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
#include "tss2_endian.h"
diff --git a/sysapi/sysapi/GetCpBuffer.c b/sysapi/sysapi/GetCpBuffer.c
index 2005c00..87fcf87 100644
--- a/sysapi/sysapi/GetCpBuffer.c
+++ b/sysapi/sysapi/GetCpBuffer.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_GetCpBuffer(
diff --git a/sysapi/sysapi/GetRpBuffer.c b/sysapi/sysapi/GetRpBuffer.c
index 6cdbe4e..c5d0906 100644
--- a/sysapi/sysapi/GetRpBuffer.c
+++ b/sysapi/sysapi/GetRpBuffer.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_GetRpBuffer(
diff --git a/sysapi/sysapi/GetTctiContext.c b/sysapi/sysapi/GetTctiContext.c
index 3bc0808..3e34e57 100644
--- a/sysapi/sysapi/GetTctiContext.c
+++ b/sysapi/sysapi/GetTctiContext.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_GetTctiContext(
diff --git a/sysapi/sysapi/Tss2_Sys_AC_GetCapability.c b/sysapi/sysapi/Tss2_Sys_AC_GetCapability.c
index cd964b7..4892780 100644
--- a/sysapi/sysapi/Tss2_Sys_AC_GetCapability.c
+++ b/sysapi/sysapi/Tss2_Sys_AC_GetCapability.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_AC_GetCapability_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_AC_Send.c b/sysapi/sysapi/Tss2_Sys_AC_Send.c
index afef99c..6b1beef 100644
--- a/sysapi/sysapi/Tss2_Sys_AC_Send.c
+++ b/sysapi/sysapi/Tss2_Sys_AC_Send.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_AC_Send_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_ActivateCredential.c b/sysapi/sysapi/Tss2_Sys_ActivateCredential.c
index 25366d6..0b67bce 100644
--- a/sysapi/sysapi/Tss2_Sys_ActivateCredential.c
+++ b/sysapi/sysapi/Tss2_Sys_ActivateCredential.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_ActivateCredential_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_Certify.c b/sysapi/sysapi/Tss2_Sys_Certify.c
index 4f2fa7f..ded2e5f 100644
--- a/sysapi/sysapi/Tss2_Sys_Certify.c
+++ b/sysapi/sysapi/Tss2_Sys_Certify.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_Certify_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_CertifyCreation.c b/sysapi/sysapi/Tss2_Sys_CertifyCreation.c
index d1d7333..ad6a842 100644
--- a/sysapi/sysapi/Tss2_Sys_CertifyCreation.c
+++ b/sysapi/sysapi/Tss2_Sys_CertifyCreation.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_CertifyCreation_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_ChangeEPS.c b/sysapi/sysapi/Tss2_Sys_ChangeEPS.c
index b5e69fe..bdf5154 100644
--- a/sysapi/sysapi/Tss2_Sys_ChangeEPS.c
+++ b/sysapi/sysapi/Tss2_Sys_ChangeEPS.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_ChangeEPS_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_ChangePPS.c b/sysapi/sysapi/Tss2_Sys_ChangePPS.c
index 89c2ce6..57551d0 100644
--- a/sysapi/sysapi/Tss2_Sys_ChangePPS.c
+++ b/sysapi/sysapi/Tss2_Sys_ChangePPS.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_ChangePPS_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_Clear.c b/sysapi/sysapi/Tss2_Sys_Clear.c
index 7069735..d38572f 100644
--- a/sysapi/sysapi/Tss2_Sys_Clear.c
+++ b/sysapi/sysapi/Tss2_Sys_Clear.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_Clear_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_ClearControl.c b/sysapi/sysapi/Tss2_Sys_ClearControl.c
index c375a99..a9677ee 100644
--- a/sysapi/sysapi/Tss2_Sys_ClearControl.c
+++ b/sysapi/sysapi/Tss2_Sys_ClearControl.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_ClearControl_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_ClockRateAdjust.c b/sysapi/sysapi/Tss2_Sys_ClockRateAdjust.c
index f11e660..7348126 100644
--- a/sysapi/sysapi/Tss2_Sys_ClockRateAdjust.c
+++ b/sysapi/sysapi/Tss2_Sys_ClockRateAdjust.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_ClockRateAdjust_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_ClockSet.c b/sysapi/sysapi/Tss2_Sys_ClockSet.c
index c58c07e..c3ed112 100644
--- a/sysapi/sysapi/Tss2_Sys_ClockSet.c
+++ b/sysapi/sysapi/Tss2_Sys_ClockSet.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_ClockSet_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_Commit.c b/sysapi/sysapi/Tss2_Sys_Commit.c
index 18691df..ea57282 100644
--- a/sysapi/sysapi/Tss2_Sys_Commit.c
+++ b/sysapi/sysapi/Tss2_Sys_Commit.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_Commit_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_ContextLoad.c b/sysapi/sysapi/Tss2_Sys_ContextLoad.c
index f397c9c..00cb7b2 100644
--- a/sysapi/sysapi/Tss2_Sys_ContextLoad.c
+++ b/sysapi/sysapi/Tss2_Sys_ContextLoad.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_ContextLoad_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_ContextSave.c b/sysapi/sysapi/Tss2_Sys_ContextSave.c
index 081d659..f29616f 100644
--- a/sysapi/sysapi/Tss2_Sys_ContextSave.c
+++ b/sysapi/sysapi/Tss2_Sys_ContextSave.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_ContextSave_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_Create.c b/sysapi/sysapi/Tss2_Sys_Create.c
index 7b28bc6..3274ea9 100644
--- a/sysapi/sysapi/Tss2_Sys_Create.c
+++ b/sysapi/sysapi/Tss2_Sys_Create.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_Create_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_CreateLoaded.c b/sysapi/sysapi/Tss2_Sys_CreateLoaded.c
index 5b4cdda..95f808e 100644
--- a/sysapi/sysapi/Tss2_Sys_CreateLoaded.c
+++ b/sysapi/sysapi/Tss2_Sys_CreateLoaded.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_CreateLoaded_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_CreatePrimary.c b/sysapi/sysapi/Tss2_Sys_CreatePrimary.c
index 14a261c..3050b4f 100644
--- a/sysapi/sysapi/Tss2_Sys_CreatePrimary.c
+++ b/sysapi/sysapi/Tss2_Sys_CreatePrimary.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_CreatePrimary_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_DictionaryAttackLockReset.c b/sysapi/sysapi/Tss2_Sys_DictionaryAttackLockReset.c
index 4cd05d5..f39f42e 100644
--- a/sysapi/sysapi/Tss2_Sys_DictionaryAttackLockReset.c
+++ b/sysapi/sysapi/Tss2_Sys_DictionaryAttackLockReset.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_DictionaryAttackLockReset_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_DictionaryAttackParameters.c b/sysapi/sysapi/Tss2_Sys_DictionaryAttackParameters.c
index c66ff80..4ec10bc 100644
--- a/sysapi/sysapi/Tss2_Sys_DictionaryAttackParameters.c
+++ b/sysapi/sysapi/Tss2_Sys_DictionaryAttackParameters.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_DictionaryAttackParameters_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_Duplicate.c b/sysapi/sysapi/Tss2_Sys_Duplicate.c
index 0a953ff..9aa5f61 100644
--- a/sysapi/sysapi/Tss2_Sys_Duplicate.c
+++ b/sysapi/sysapi/Tss2_Sys_Duplicate.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_Duplicate_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_ECC_Parameters.c b/sysapi/sysapi/Tss2_Sys_ECC_Parameters.c
index bcc22a9..74d4a4b 100644
--- a/sysapi/sysapi/Tss2_Sys_ECC_Parameters.c
+++ b/sysapi/sysapi/Tss2_Sys_ECC_Parameters.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_ECC_Parameters_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_ECDH_KeyGen.c b/sysapi/sysapi/Tss2_Sys_ECDH_KeyGen.c
index 95a5613..b3ceadf 100644
--- a/sysapi/sysapi/Tss2_Sys_ECDH_KeyGen.c
+++ b/sysapi/sysapi/Tss2_Sys_ECDH_KeyGen.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_ECDH_KeyGen_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_ECDH_ZGen.c b/sysapi/sysapi/Tss2_Sys_ECDH_ZGen.c
index 71a3700..7cfbc90 100644
--- a/sysapi/sysapi/Tss2_Sys_ECDH_ZGen.c
+++ b/sysapi/sysapi/Tss2_Sys_ECDH_ZGen.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_ECDH_ZGen_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_EC_Ephemeral.c b/sysapi/sysapi/Tss2_Sys_EC_Ephemeral.c
index 7ee96d7..641aa4b 100644
--- a/sysapi/sysapi/Tss2_Sys_EC_Ephemeral.c
+++ b/sysapi/sysapi/Tss2_Sys_EC_Ephemeral.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_EC_Ephemeral_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_EncryptDecrypt.c b/sysapi/sysapi/Tss2_Sys_EncryptDecrypt.c
index 6671700..a0b8c13 100644
--- a/sysapi/sysapi/Tss2_Sys_EncryptDecrypt.c
+++ b/sysapi/sysapi/Tss2_Sys_EncryptDecrypt.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_EncryptDecrypt_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_EncryptDecrypt2.c b/sysapi/sysapi/Tss2_Sys_EncryptDecrypt2.c
index 13df3cf..269b84d 100644
--- a/sysapi/sysapi/Tss2_Sys_EncryptDecrypt2.c
+++ b/sysapi/sysapi/Tss2_Sys_EncryptDecrypt2.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_EncryptDecrypt2_Prepare (
diff --git a/sysapi/sysapi/Tss2_Sys_EventSequenceComplete.c b/sysapi/sysapi/Tss2_Sys_EventSequenceComplete.c
index 080303a..6cc6f0a 100644
--- a/sysapi/sysapi/Tss2_Sys_EventSequenceComplete.c
+++ b/sysapi/sysapi/Tss2_Sys_EventSequenceComplete.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_EventSequenceComplete_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_EvictControl.c b/sysapi/sysapi/Tss2_Sys_EvictControl.c
index 433bdd5..2760498 100644
--- a/sysapi/sysapi/Tss2_Sys_EvictControl.c
+++ b/sysapi/sysapi/Tss2_Sys_EvictControl.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_EvictControl_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_FieldUpgradeData.c b/sysapi/sysapi/Tss2_Sys_FieldUpgradeData.c
index 41d7335..5100ba8 100644
--- a/sysapi/sysapi/Tss2_Sys_FieldUpgradeData.c
+++ b/sysapi/sysapi/Tss2_Sys_FieldUpgradeData.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_FieldUpgradeData_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_FieldUpgradeStart.c b/sysapi/sysapi/Tss2_Sys_FieldUpgradeStart.c
index 8f63581..2b77e4b 100644
--- a/sysapi/sysapi/Tss2_Sys_FieldUpgradeStart.c
+++ b/sysapi/sysapi/Tss2_Sys_FieldUpgradeStart.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_FieldUpgradeStart_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_Finalize.c b/sysapi/sysapi/Tss2_Sys_Finalize.c
index 5956bd1..a9be352 100644
--- a/sysapi/sysapi/Tss2_Sys_Finalize.c
+++ b/sysapi/sysapi/Tss2_Sys_Finalize.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_Finalize_Complete (
diff --git a/sysapi/sysapi/Tss2_Sys_FirmwareRead.c b/sysapi/sysapi/Tss2_Sys_FirmwareRead.c
index 38dc74a..5dcef0a 100644
--- a/sysapi/sysapi/Tss2_Sys_FirmwareRead.c
+++ b/sysapi/sysapi/Tss2_Sys_FirmwareRead.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_FirmwareRead_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_FlushContext.c b/sysapi/sysapi/Tss2_Sys_FlushContext.c
index f7e20c3..72f6f78 100644
--- a/sysapi/sysapi/Tss2_Sys_FlushContext.c
+++ b/sysapi/sysapi/Tss2_Sys_FlushContext.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_FlushContext_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_GetCapability.c b/sysapi/sysapi/Tss2_Sys_GetCapability.c
index 8560810..d747713 100644
--- a/sysapi/sysapi/Tss2_Sys_GetCapability.c
+++ b/sysapi/sysapi/Tss2_Sys_GetCapability.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_GetCapability_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_GetCommandAuditDigest.c b/sysapi/sysapi/Tss2_Sys_GetCommandAuditDigest.c
index 2ac760c..0753bf4 100644
--- a/sysapi/sysapi/Tss2_Sys_GetCommandAuditDigest.c
+++ b/sysapi/sysapi/Tss2_Sys_GetCommandAuditDigest.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_GetCommandAuditDigest_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_GetRandom.c b/sysapi/sysapi/Tss2_Sys_GetRandom.c
index 91c43e6..c95333a 100644
--- a/sysapi/sysapi/Tss2_Sys_GetRandom.c
+++ b/sysapi/sysapi/Tss2_Sys_GetRandom.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_GetRandom_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_GetSessionAuditDigest.c b/sysapi/sysapi/Tss2_Sys_GetSessionAuditDigest.c
index 99b264e..4340b4d 100644
--- a/sysapi/sysapi/Tss2_Sys_GetSessionAuditDigest.c
+++ b/sysapi/sysapi/Tss2_Sys_GetSessionAuditDigest.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_GetSessionAuditDigest_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_GetTestResult.c b/sysapi/sysapi/Tss2_Sys_GetTestResult.c
index 9350db7..f63094b 100644
--- a/sysapi/sysapi/Tss2_Sys_GetTestResult.c
+++ b/sysapi/sysapi/Tss2_Sys_GetTestResult.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_GetTestResult_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_GetTime.c b/sysapi/sysapi/Tss2_Sys_GetTime.c
index b612954..101f742 100644
--- a/sysapi/sysapi/Tss2_Sys_GetTime.c
+++ b/sysapi/sysapi/Tss2_Sys_GetTime.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_GetTime_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_HMAC.c b/sysapi/sysapi/Tss2_Sys_HMAC.c
index 3d52953..c5e1f89 100644
--- a/sysapi/sysapi/Tss2_Sys_HMAC.c
+++ b/sysapi/sysapi/Tss2_Sys_HMAC.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_HMAC_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_HMAC_Start.c b/sysapi/sysapi/Tss2_Sys_HMAC_Start.c
index a34eef5..99022ee 100644
--- a/sysapi/sysapi/Tss2_Sys_HMAC_Start.c
+++ b/sysapi/sysapi/Tss2_Sys_HMAC_Start.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_HMAC_Start_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_Hash.c b/sysapi/sysapi/Tss2_Sys_Hash.c
index 4e61ae5..408f7f2 100644
--- a/sysapi/sysapi/Tss2_Sys_Hash.c
+++ b/sysapi/sysapi/Tss2_Sys_Hash.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_Hash_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_HashSequenceStart.c b/sysapi/sysapi/Tss2_Sys_HashSequenceStart.c
index 518c940..9793409 100644
--- a/sysapi/sysapi/Tss2_Sys_HashSequenceStart.c
+++ b/sysapi/sysapi/Tss2_Sys_HashSequenceStart.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_HashSequenceStart_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_HierarchyChangeAuth.c b/sysapi/sysapi/Tss2_Sys_HierarchyChangeAuth.c
index b8478ab..e476d22 100644
--- a/sysapi/sysapi/Tss2_Sys_HierarchyChangeAuth.c
+++ b/sysapi/sysapi/Tss2_Sys_HierarchyChangeAuth.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_HierarchyChangeAuth_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_HierarchyControl.c b/sysapi/sysapi/Tss2_Sys_HierarchyControl.c
index 7fe3b78..738f1c0 100644
--- a/sysapi/sysapi/Tss2_Sys_HierarchyControl.c
+++ b/sysapi/sysapi/Tss2_Sys_HierarchyControl.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_HierarchyControl_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_Import.c b/sysapi/sysapi/Tss2_Sys_Import.c
index 056064a..8ee4b53 100644
--- a/sysapi/sysapi/Tss2_Sys_Import.c
+++ b/sysapi/sysapi/Tss2_Sys_Import.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_Import_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_IncrementalSelfTest.c b/sysapi/sysapi/Tss2_Sys_IncrementalSelfTest.c
index b429b63..e70bfcb 100644
--- a/sysapi/sysapi/Tss2_Sys_IncrementalSelfTest.c
+++ b/sysapi/sysapi/Tss2_Sys_IncrementalSelfTest.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_IncrementalSelfTest_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_Load.c b/sysapi/sysapi/Tss2_Sys_Load.c
index f2f8057..aeab4a1 100644
--- a/sysapi/sysapi/Tss2_Sys_Load.c
+++ b/sysapi/sysapi/Tss2_Sys_Load.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_Load_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_LoadExternal.c b/sysapi/sysapi/Tss2_Sys_LoadExternal.c
index 0f6e64c..63f2d68 100644
--- a/sysapi/sysapi/Tss2_Sys_LoadExternal.c
+++ b/sysapi/sysapi/Tss2_Sys_LoadExternal.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_LoadExternal_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_MakeCredential.c b/sysapi/sysapi/Tss2_Sys_MakeCredential.c
index b392c81..ff15238 100644
--- a/sysapi/sysapi/Tss2_Sys_MakeCredential.c
+++ b/sysapi/sysapi/Tss2_Sys_MakeCredential.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_MakeCredential_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_NV_Certify.c b/sysapi/sysapi/Tss2_Sys_NV_Certify.c
index f4e2fb9..5fbb80d 100644
--- a/sysapi/sysapi/Tss2_Sys_NV_Certify.c
+++ b/sysapi/sysapi/Tss2_Sys_NV_Certify.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_NV_Certify_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_NV_ChangeAuth.c b/sysapi/sysapi/Tss2_Sys_NV_ChangeAuth.c
index 8fdf9b2..20d153d 100644
--- a/sysapi/sysapi/Tss2_Sys_NV_ChangeAuth.c
+++ b/sysapi/sysapi/Tss2_Sys_NV_ChangeAuth.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_NV_ChangeAuth_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_NV_DefineSpace.c b/sysapi/sysapi/Tss2_Sys_NV_DefineSpace.c
index 6c4c199..417a984 100644
--- a/sysapi/sysapi/Tss2_Sys_NV_DefineSpace.c
+++ b/sysapi/sysapi/Tss2_Sys_NV_DefineSpace.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_NV_DefineSpace_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_NV_Extend.c b/sysapi/sysapi/Tss2_Sys_NV_Extend.c
index c4b7969..43e4a64 100644
--- a/sysapi/sysapi/Tss2_Sys_NV_Extend.c
+++ b/sysapi/sysapi/Tss2_Sys_NV_Extend.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_NV_Extend_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_NV_GlobalWriteLock.c b/sysapi/sysapi/Tss2_Sys_NV_GlobalWriteLock.c
index b080b5d..6fd76b1 100644
--- a/sysapi/sysapi/Tss2_Sys_NV_GlobalWriteLock.c
+++ b/sysapi/sysapi/Tss2_Sys_NV_GlobalWriteLock.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_NV_GlobalWriteLock_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_NV_Increment.c b/sysapi/sysapi/Tss2_Sys_NV_Increment.c
index 7851479..ea35d55 100644
--- a/sysapi/sysapi/Tss2_Sys_NV_Increment.c
+++ b/sysapi/sysapi/Tss2_Sys_NV_Increment.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_NV_Increment_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_NV_Read.c b/sysapi/sysapi/Tss2_Sys_NV_Read.c
index 3ddd4d1..33314ea 100644
--- a/sysapi/sysapi/Tss2_Sys_NV_Read.c
+++ b/sysapi/sysapi/Tss2_Sys_NV_Read.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_NV_Read_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_NV_ReadLock.c b/sysapi/sysapi/Tss2_Sys_NV_ReadLock.c
index 0ef448f..a8c22d9 100644
--- a/sysapi/sysapi/Tss2_Sys_NV_ReadLock.c
+++ b/sysapi/sysapi/Tss2_Sys_NV_ReadLock.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_NV_ReadLock_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_NV_ReadPublic.c b/sysapi/sysapi/Tss2_Sys_NV_ReadPublic.c
index ed5ce47..6fa6249 100644
--- a/sysapi/sysapi/Tss2_Sys_NV_ReadPublic.c
+++ b/sysapi/sysapi/Tss2_Sys_NV_ReadPublic.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_NV_ReadPublic_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_NV_SetBits.c b/sysapi/sysapi/Tss2_Sys_NV_SetBits.c
index eb04c21..f89ffb0 100644
--- a/sysapi/sysapi/Tss2_Sys_NV_SetBits.c
+++ b/sysapi/sysapi/Tss2_Sys_NV_SetBits.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_NV_SetBits_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_NV_UndefineSpace.c b/sysapi/sysapi/Tss2_Sys_NV_UndefineSpace.c
index add5c07..3d52d95 100644
--- a/sysapi/sysapi/Tss2_Sys_NV_UndefineSpace.c
+++ b/sysapi/sysapi/Tss2_Sys_NV_UndefineSpace.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_NV_UndefineSpace_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_NV_UndefineSpaceSpecial.c b/sysapi/sysapi/Tss2_Sys_NV_UndefineSpaceSpecial.c
index 8fcc780..4e78280 100644
--- a/sysapi/sysapi/Tss2_Sys_NV_UndefineSpaceSpecial.c
+++ b/sysapi/sysapi/Tss2_Sys_NV_UndefineSpaceSpecial.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_NV_UndefineSpaceSpecial_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_NV_Write.c b/sysapi/sysapi/Tss2_Sys_NV_Write.c
index 6c12d1a..2b92322 100644
--- a/sysapi/sysapi/Tss2_Sys_NV_Write.c
+++ b/sysapi/sysapi/Tss2_Sys_NV_Write.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_NV_Write_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_NV_WriteLock.c b/sysapi/sysapi/Tss2_Sys_NV_WriteLock.c
index e0a97d0..e842ae6 100644
--- a/sysapi/sysapi/Tss2_Sys_NV_WriteLock.c
+++ b/sysapi/sysapi/Tss2_Sys_NV_WriteLock.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_NV_WriteLock_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_ObjectChangeAuth.c b/sysapi/sysapi/Tss2_Sys_ObjectChangeAuth.c
index 169d2b8..abc6666 100644
--- a/sysapi/sysapi/Tss2_Sys_ObjectChangeAuth.c
+++ b/sysapi/sysapi/Tss2_Sys_ObjectChangeAuth.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_ObjectChangeAuth_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PCR_Allocate.c b/sysapi/sysapi/Tss2_Sys_PCR_Allocate.c
index 25cacaa..09a0187 100644
--- a/sysapi/sysapi/Tss2_Sys_PCR_Allocate.c
+++ b/sysapi/sysapi/Tss2_Sys_PCR_Allocate.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PCR_Allocate_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PCR_Event.c b/sysapi/sysapi/Tss2_Sys_PCR_Event.c
index 8a43281..2c3b7da 100644
--- a/sysapi/sysapi/Tss2_Sys_PCR_Event.c
+++ b/sysapi/sysapi/Tss2_Sys_PCR_Event.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PCR_Event_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PCR_Extend.c b/sysapi/sysapi/Tss2_Sys_PCR_Extend.c
index 8326949..1b4b638 100644
--- a/sysapi/sysapi/Tss2_Sys_PCR_Extend.c
+++ b/sysapi/sysapi/Tss2_Sys_PCR_Extend.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PCR_Extend_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PCR_Read.c b/sysapi/sysapi/Tss2_Sys_PCR_Read.c
index 566d479..f68a534 100644
--- a/sysapi/sysapi/Tss2_Sys_PCR_Read.c
+++ b/sysapi/sysapi/Tss2_Sys_PCR_Read.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PCR_Read_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PCR_Reset.c b/sysapi/sysapi/Tss2_Sys_PCR_Reset.c
index f86fa41..bbe196f 100644
--- a/sysapi/sysapi/Tss2_Sys_PCR_Reset.c
+++ b/sysapi/sysapi/Tss2_Sys_PCR_Reset.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PCR_Reset_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PCR_SetAuthPolicy.c b/sysapi/sysapi/Tss2_Sys_PCR_SetAuthPolicy.c
index e8109c4..53d49fa 100644
--- a/sysapi/sysapi/Tss2_Sys_PCR_SetAuthPolicy.c
+++ b/sysapi/sysapi/Tss2_Sys_PCR_SetAuthPolicy.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PCR_SetAuthPolicy_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PCR_SetAuthValue.c b/sysapi/sysapi/Tss2_Sys_PCR_SetAuthValue.c
index 551dbee..7a1170c 100644
--- a/sysapi/sysapi/Tss2_Sys_PCR_SetAuthValue.c
+++ b/sysapi/sysapi/Tss2_Sys_PCR_SetAuthValue.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PCR_SetAuthValue_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PP_Commands.c b/sysapi/sysapi/Tss2_Sys_PP_Commands.c
index 6a7a56a..ec3a013 100644
--- a/sysapi/sysapi/Tss2_Sys_PP_Commands.c
+++ b/sysapi/sysapi/Tss2_Sys_PP_Commands.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PP_Commands_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PolicyAuthValue.c b/sysapi/sysapi/Tss2_Sys_PolicyAuthValue.c
index 37b9974..f18e67a 100644
--- a/sysapi/sysapi/Tss2_Sys_PolicyAuthValue.c
+++ b/sysapi/sysapi/Tss2_Sys_PolicyAuthValue.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PolicyAuthValue_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PolicyAuthorize.c b/sysapi/sysapi/Tss2_Sys_PolicyAuthorize.c
index 2df1efe..e1ef3a1 100644
--- a/sysapi/sysapi/Tss2_Sys_PolicyAuthorize.c
+++ b/sysapi/sysapi/Tss2_Sys_PolicyAuthorize.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PolicyAuthorize_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PolicyAuthorizeNV.c b/sysapi/sysapi/Tss2_Sys_PolicyAuthorizeNV.c
index 505654a..45c48ea 100644
--- a/sysapi/sysapi/Tss2_Sys_PolicyAuthorizeNV.c
+++ b/sysapi/sysapi/Tss2_Sys_PolicyAuthorizeNV.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PolicyAuthorizeNV_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PolicyCommandCode.c b/sysapi/sysapi/Tss2_Sys_PolicyCommandCode.c
index 7eb39e9..bfd6719 100644
--- a/sysapi/sysapi/Tss2_Sys_PolicyCommandCode.c
+++ b/sysapi/sysapi/Tss2_Sys_PolicyCommandCode.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PolicyCommandCode_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PolicyCounterTimer.c b/sysapi/sysapi/Tss2_Sys_PolicyCounterTimer.c
index 3ccd481..b4dcf28 100644
--- a/sysapi/sysapi/Tss2_Sys_PolicyCounterTimer.c
+++ b/sysapi/sysapi/Tss2_Sys_PolicyCounterTimer.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PolicyCounterTimer_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PolicyCpHash.c b/sysapi/sysapi/Tss2_Sys_PolicyCpHash.c
index 4a15585..f42247b 100644
--- a/sysapi/sysapi/Tss2_Sys_PolicyCpHash.c
+++ b/sysapi/sysapi/Tss2_Sys_PolicyCpHash.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PolicyCpHash_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PolicyDuplicationSelect.c b/sysapi/sysapi/Tss2_Sys_PolicyDuplicationSelect.c
index 3ad3504..a42e6c7 100644
--- a/sysapi/sysapi/Tss2_Sys_PolicyDuplicationSelect.c
+++ b/sysapi/sysapi/Tss2_Sys_PolicyDuplicationSelect.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PolicyDuplicationSelect_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PolicyGetDigest.c b/sysapi/sysapi/Tss2_Sys_PolicyGetDigest.c
index cbda0c4..b303a90 100644
--- a/sysapi/sysapi/Tss2_Sys_PolicyGetDigest.c
+++ b/sysapi/sysapi/Tss2_Sys_PolicyGetDigest.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PolicyGetDigest_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PolicyLocality.c b/sysapi/sysapi/Tss2_Sys_PolicyLocality.c
index 37fae15..e8f9287 100644
--- a/sysapi/sysapi/Tss2_Sys_PolicyLocality.c
+++ b/sysapi/sysapi/Tss2_Sys_PolicyLocality.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PolicyLocality_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PolicyNV.c b/sysapi/sysapi/Tss2_Sys_PolicyNV.c
index 682dea1..27633ae 100644
--- a/sysapi/sysapi/Tss2_Sys_PolicyNV.c
+++ b/sysapi/sysapi/Tss2_Sys_PolicyNV.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PolicyNV_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PolicyNameHash.c b/sysapi/sysapi/Tss2_Sys_PolicyNameHash.c
index 32ab1e0..bb2b2d4 100644
--- a/sysapi/sysapi/Tss2_Sys_PolicyNameHash.c
+++ b/sysapi/sysapi/Tss2_Sys_PolicyNameHash.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PolicyNameHash_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PolicyNvWritten.c b/sysapi/sysapi/Tss2_Sys_PolicyNvWritten.c
index d0c2808..8718dea 100644
--- a/sysapi/sysapi/Tss2_Sys_PolicyNvWritten.c
+++ b/sysapi/sysapi/Tss2_Sys_PolicyNvWritten.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PolicyNvWritten_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PolicyOR.c b/sysapi/sysapi/Tss2_Sys_PolicyOR.c
index 4312710..3a6c244 100644
--- a/sysapi/sysapi/Tss2_Sys_PolicyOR.c
+++ b/sysapi/sysapi/Tss2_Sys_PolicyOR.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PolicyOR_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PolicyPCR.c b/sysapi/sysapi/Tss2_Sys_PolicyPCR.c
index d49acd4..0eb0a71 100644
--- a/sysapi/sysapi/Tss2_Sys_PolicyPCR.c
+++ b/sysapi/sysapi/Tss2_Sys_PolicyPCR.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PolicyPCR_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PolicyPassword.c b/sysapi/sysapi/Tss2_Sys_PolicyPassword.c
index b4d417d..d629f3d 100644
--- a/sysapi/sysapi/Tss2_Sys_PolicyPassword.c
+++ b/sysapi/sysapi/Tss2_Sys_PolicyPassword.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PolicyPassword_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PolicyPhysicalPresence.c b/sysapi/sysapi/Tss2_Sys_PolicyPhysicalPresence.c
index 7b17731..e44accb 100644
--- a/sysapi/sysapi/Tss2_Sys_PolicyPhysicalPresence.c
+++ b/sysapi/sysapi/Tss2_Sys_PolicyPhysicalPresence.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PolicyPhysicalPresence_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PolicyRestart.c b/sysapi/sysapi/Tss2_Sys_PolicyRestart.c
index 6ce0e5c..5c38e31 100644
--- a/sysapi/sysapi/Tss2_Sys_PolicyRestart.c
+++ b/sysapi/sysapi/Tss2_Sys_PolicyRestart.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PolicyRestart_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PolicySecret.c b/sysapi/sysapi/Tss2_Sys_PolicySecret.c
index 3a5c113..787ea90 100644
--- a/sysapi/sysapi/Tss2_Sys_PolicySecret.c
+++ b/sysapi/sysapi/Tss2_Sys_PolicySecret.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PolicySecret_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PolicySigned.c b/sysapi/sysapi/Tss2_Sys_PolicySigned.c
index 5e80d6c..c92926c 100644
--- a/sysapi/sysapi/Tss2_Sys_PolicySigned.c
+++ b/sysapi/sysapi/Tss2_Sys_PolicySigned.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PolicySigned_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PolicyTemplate.c b/sysapi/sysapi/Tss2_Sys_PolicyTemplate.c
index a340d7c..46b5e44 100644
--- a/sysapi/sysapi/Tss2_Sys_PolicyTemplate.c
+++ b/sysapi/sysapi/Tss2_Sys_PolicyTemplate.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PolicyTemplate_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_PolicyTicket.c b/sysapi/sysapi/Tss2_Sys_PolicyTicket.c
index c4faea9..588c8bb 100644
--- a/sysapi/sysapi/Tss2_Sys_PolicyTicket.c
+++ b/sysapi/sysapi/Tss2_Sys_PolicyTicket.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_PolicyTicket_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_Policy_AC_SendSelect.c b/sysapi/sysapi/Tss2_Sys_Policy_AC_SendSelect.c
index 152574b..3fd5c88 100644
--- a/sysapi/sysapi/Tss2_Sys_Policy_AC_SendSelect.c
+++ b/sysapi/sysapi/Tss2_Sys_Policy_AC_SendSelect.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_Policy_AC_SendSelect_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_Quote.c b/sysapi/sysapi/Tss2_Sys_Quote.c
index 94cb18b..ed978eb 100644
--- a/sysapi/sysapi/Tss2_Sys_Quote.c
+++ b/sysapi/sysapi/Tss2_Sys_Quote.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_Quote_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_RSA_Decrypt.c b/sysapi/sysapi/Tss2_Sys_RSA_Decrypt.c
index fc8dd1d..f08db07 100644
--- a/sysapi/sysapi/Tss2_Sys_RSA_Decrypt.c
+++ b/sysapi/sysapi/Tss2_Sys_RSA_Decrypt.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_RSA_Decrypt_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_RSA_Encrypt.c b/sysapi/sysapi/Tss2_Sys_RSA_Encrypt.c
index f1d966d..20a76d2 100644
--- a/sysapi/sysapi/Tss2_Sys_RSA_Encrypt.c
+++ b/sysapi/sysapi/Tss2_Sys_RSA_Encrypt.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_RSA_Encrypt_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_ReadClock.c b/sysapi/sysapi/Tss2_Sys_ReadClock.c
index ed2c751..a66d94f 100644
--- a/sysapi/sysapi/Tss2_Sys_ReadClock.c
+++ b/sysapi/sysapi/Tss2_Sys_ReadClock.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_ReadClock_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_ReadPublic.c b/sysapi/sysapi/Tss2_Sys_ReadPublic.c
index f71a252..b79d698 100644
--- a/sysapi/sysapi/Tss2_Sys_ReadPublic.c
+++ b/sysapi/sysapi/Tss2_Sys_ReadPublic.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_ReadPublic_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_Rewrap.c b/sysapi/sysapi/Tss2_Sys_Rewrap.c
index 486a9b1..f5374fa 100644
--- a/sysapi/sysapi/Tss2_Sys_Rewrap.c
+++ b/sysapi/sysapi/Tss2_Sys_Rewrap.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_Rewrap_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_SelfTest.c b/sysapi/sysapi/Tss2_Sys_SelfTest.c
index 664191c..99bb7b9 100644
--- a/sysapi/sysapi/Tss2_Sys_SelfTest.c
+++ b/sysapi/sysapi/Tss2_Sys_SelfTest.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_SelfTest_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_SequenceComplete.c b/sysapi/sysapi/Tss2_Sys_SequenceComplete.c
index f520f74..c8a3dc7 100644
--- a/sysapi/sysapi/Tss2_Sys_SequenceComplete.c
+++ b/sysapi/sysapi/Tss2_Sys_SequenceComplete.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_SequenceComplete_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_SequenceUpdate.c b/sysapi/sysapi/Tss2_Sys_SequenceUpdate.c
index 1e36a97..7adff27 100644
--- a/sysapi/sysapi/Tss2_Sys_SequenceUpdate.c
+++ b/sysapi/sysapi/Tss2_Sys_SequenceUpdate.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_SequenceUpdate_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_SetAlgorithmSet.c b/sysapi/sysapi/Tss2_Sys_SetAlgorithmSet.c
index d0959a7..210f663 100644
--- a/sysapi/sysapi/Tss2_Sys_SetAlgorithmSet.c
+++ b/sysapi/sysapi/Tss2_Sys_SetAlgorithmSet.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_SetAlgorithmSet_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_SetCommandCodeAuditStatus.c b/sysapi/sysapi/Tss2_Sys_SetCommandCodeAuditStatus.c
index 6876ded..6f97242 100644
--- a/sysapi/sysapi/Tss2_Sys_SetCommandCodeAuditStatus.c
+++ b/sysapi/sysapi/Tss2_Sys_SetCommandCodeAuditStatus.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_SetCommandCodeAuditStatus_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_SetPrimaryPolicy.c b/sysapi/sysapi/Tss2_Sys_SetPrimaryPolicy.c
index 1da1085..113aee1 100644
--- a/sysapi/sysapi/Tss2_Sys_SetPrimaryPolicy.c
+++ b/sysapi/sysapi/Tss2_Sys_SetPrimaryPolicy.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_SetPrimaryPolicy_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_Shutdown.c b/sysapi/sysapi/Tss2_Sys_Shutdown.c
index 800f612..ea6168c 100644
--- a/sysapi/sysapi/Tss2_Sys_Shutdown.c
+++ b/sysapi/sysapi/Tss2_Sys_Shutdown.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_Shutdown_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_Sign.c b/sysapi/sysapi/Tss2_Sys_Sign.c
index a70f49b0..10e9d4a 100644
--- a/sysapi/sysapi/Tss2_Sys_Sign.c
+++ b/sysapi/sysapi/Tss2_Sys_Sign.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_Sign_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_StartAuthSession.c b/sysapi/sysapi/Tss2_Sys_StartAuthSession.c
index 43c716b..65bb233 100644
--- a/sysapi/sysapi/Tss2_Sys_StartAuthSession.c
+++ b/sysapi/sysapi/Tss2_Sys_StartAuthSession.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_StartAuthSession_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_Startup.c b/sysapi/sysapi/Tss2_Sys_Startup.c
index a7dad2c..40097cc 100644
--- a/sysapi/sysapi/Tss2_Sys_Startup.c
+++ b/sysapi/sysapi/Tss2_Sys_Startup.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_Startup_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_StirRandom.c b/sysapi/sysapi/Tss2_Sys_StirRandom.c
index e4a6d0b..33396a6 100644
--- a/sysapi/sysapi/Tss2_Sys_StirRandom.c
+++ b/sysapi/sysapi/Tss2_Sys_StirRandom.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_StirRandom_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_TestParms.c b/sysapi/sysapi/Tss2_Sys_TestParms.c
index 6f69272..4351585 100644
--- a/sysapi/sysapi/Tss2_Sys_TestParms.c
+++ b/sysapi/sysapi/Tss2_Sys_TestParms.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_TestParms_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_Unseal.c b/sysapi/sysapi/Tss2_Sys_Unseal.c
index 0c2cdc6..18d9dd1 100644
--- a/sysapi/sysapi/Tss2_Sys_Unseal.c
+++ b/sysapi/sysapi/Tss2_Sys_Unseal.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_Unseal_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_Vendor_TCG_Test.c b/sysapi/sysapi/Tss2_Sys_Vendor_TCG_Test.c
index 6054885..067af60 100644
--- a/sysapi/sysapi/Tss2_Sys_Vendor_TCG_Test.c
+++ b/sysapi/sysapi/Tss2_Sys_Vendor_TCG_Test.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_Vendor_TCG_Test_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_VerifySignature.c b/sysapi/sysapi/Tss2_Sys_VerifySignature.c
index c67b79c..baceb89 100644
--- a/sysapi/sysapi/Tss2_Sys_VerifySignature.c
+++ b/sysapi/sysapi/Tss2_Sys_VerifySignature.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_VerifySignature_Prepare(
diff --git a/sysapi/sysapi/Tss2_Sys_ZGen_2Phase.c b/sysapi/sysapi/Tss2_Sys_ZGen_2Phase.c
index a64eec5..db23cca 100644
--- a/sysapi/sysapi/Tss2_Sys_ZGen_2Phase.c
+++ b/sysapi/sysapi/Tss2_Sys_ZGen_2Phase.c
@@ -25,7 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_ZGen_2Phase_Prepare(
diff --git a/sysapi/sysapi/authorizations.c b/sysapi/sysapi/authorizations.c
index 14d7b58..2563e70 100644
--- a/sysapi/sysapi/authorizations.c
+++ b/sysapi/sysapi/authorizations.c
@@ -27,7 +27,7 @@
***********************************************************************/
#include "tss2_endian.h"
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC Tss2_Sys_SetCmdAuths(
diff --git a/sysapi/sysapi/execute.c b/sysapi/sysapi/execute.c
index c0c746c..1add373 100644
--- a/sysapi/sysapi/execute.c
+++ b/sysapi/sysapi/execute.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
#include "tss2_endian.h"
diff --git a/sysapi/sysapi_util/CommandUtil.c b/sysapi/sysapi_util/CommandUtil.c
index 1f86af4..9583892 100644
--- a/sysapi/sysapi_util/CommandUtil.c
+++ b/sysapi/sysapi_util/CommandUtil.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
#include "tss2_endian.h"
diff --git a/sysapi/sysapi_util/CompareSizedByteBuffer.c b/sysapi/sysapi_util/CompareSizedByteBuffer.c
index 972899c..5bcc15e 100644
--- a/sysapi/sysapi_util/CompareSizedByteBuffer.c
+++ b/sysapi/sysapi_util/CompareSizedByteBuffer.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC CompareSizedByteBuffer(TPM2B *buffer1, TPM2B *buffer2)
diff --git a/sysapi/sysapi_util/ConcatSizedByteBuffer.c b/sysapi/sysapi_util/ConcatSizedByteBuffer.c
index d72098c..87d0c16 100644
--- a/sysapi/sysapi_util/ConcatSizedByteBuffer.c
+++ b/sysapi/sysapi_util/ConcatSizedByteBuffer.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
TSS2_RC ConcatSizedByteBuffer(TPM2B_MAX_BUFFER *result, TPM2B *addBuffer)
diff --git a/sysapi/sysapi_util/GetDigestSize.c b/sysapi/sysapi_util/GetDigestSize.c
index 2aecbe0..e5592df 100644
--- a/sysapi/sysapi_util/GetDigestSize.c
+++ b/sysapi/sysapi_util/GetDigestSize.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
typedef struct {
diff --git a/sysapi/sysapi_util/GetNumHandles.c b/sysapi/sysapi_util/GetNumHandles.c
index 2f4ff15..03e58a8 100644
--- a/sysapi/sysapi_util/GetNumHandles.c
+++ b/sysapi/sysapi_util/GetNumHandles.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
COMMAND_HANDLES commandArray[] =
diff --git a/sysapi/tss2-sapi.vcxproj b/sysapi/tss2-sapi.vcxproj
index 4c67c1d..47291b7 100644
--- a/sysapi/tss2-sapi.vcxproj
+++ b/sysapi/tss2-sapi.vcxproj
@@ -193,9 +193,9 @@
<ImportGroup Label="Shared" />
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>$(Configuration)\</OutDir>
- <IntDir>$(Configuration)\</IntDir>
+ <PropertyGroup>
+ <OutDir>$(SolutionDir)\$(Configuration)\$(Platform)\</OutDir>
+ <IntDir>$(SolutionDir)\$(Configuration)\$(Platform)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
@@ -203,18 +203,13 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_USRDLL;tss2_sapi_EXPORTS;MAXLOGLEVEL=3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_DEBUG;_WINDOWS;_USRDLL;tss2_sapi_EXPORTS;MAXLOGLEVEL=6;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NDEBUG;_WINDOWS;_USRDLL;tss2_sapi_EXPORTS;MAXLOGLEVEL=3;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">include;..\include;..\marshal;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">include;..\include;..\marshal;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\include\tss2;$(SolutionDir)\marshal;$(SolutionDir)/sysapi/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\marshal\$(Configuration)\tss2-mu.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <ModuleDefinitionFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\tss2-sapi.def</ModuleDefinitionFile>
- <AdditionalLibraryDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\tss2-sapi.def</ModuleDefinitionFile>
- <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\$(Configuration)\tss2-mu.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>$(SolutionDir)\lib\tss2-sapi.def</ModuleDefinitionFile>
+ <AdditionalDependencies>$(OutDir)\tss2-mu.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/tcti/sockets.h b/tcti/sockets.h
index 1c43875..22ba0eb 100644
--- a/tcti/sockets.h
+++ b/tcti/sockets.h
@@ -4,7 +4,7 @@
#include <sys/socket.h>
#include <sys/un.h>
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#define SOCKET int
diff --git a/tcti/tcti-mssim.c b/tcti/tcti-mssim.c
index 06ca593..8de08b6 100644
--- a/tcti/tcti-mssim.c
+++ b/tcti/tcti-mssim.c
@@ -35,9 +35,9 @@
#include <uriparser/Uri.h>
-#include "sapi/tss2_mu.h"
+#include "tss2_mu.h"
#include "sockets.h"
-#include "tcti/tcti_mssim.h"
+#include "tss2_tcti_mssim.h"
#include "tcti.h"
#define LOGMODULE tcti
#include "log/log.h"
diff --git a/tcti/tcti.c b/tcti/tcti.c
index 0f28423..96e2d4d 100644
--- a/tcti/tcti.c
+++ b/tcti/tcti.c
@@ -30,7 +30,7 @@
#include <stdlib.h>
#include <unistd.h>
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "tcti.h"
#define LOGMODULE tcti
#include "log/log.h"
diff --git a/tcti/tcti.h b/tcti/tcti.h
index 0466fba..0195f73 100644
--- a/tcti/tcti.h
+++ b/tcti/tcti.h
@@ -41,7 +41,6 @@
#define TSS2_TCTI_UTIL_H
#include <errno.h>
-#include <sapi/tpm20.h>
#include <stdbool.h>
#if defined(__linux__) || defined(__unix__) || defined(__APPLE__)
@@ -49,6 +48,8 @@
#define SOCKET int
#endif
+#include "tpm20.h"
+
#define TCTI_MAGIC 0x7e18e9defa8bc9e2ULL
#define TCTI_VERSION 0x2
diff --git a/tcti/tcti_device.c b/tcti/tcti_device.c
index 856528c..a220fa3 100644
--- a/tcti/tcti_device.c
+++ b/tcti/tcti_device.c
@@ -36,7 +36,7 @@
#include <unistd.h>
#include "tcti.h"
-#include "tcti/tcti_device.h"
+#include "tss2_tcti_device.h"
#define LOGMODULE tcti
#include "log/log.h"
diff --git a/test/integration/abi-version.int.c b/test/integration/abi-version.int.c
index aa8e8c1..4c59554 100644
--- a/test/integration/abi-version.int.c
+++ b/test/integration/abi-version.int.c
@@ -2,7 +2,7 @@
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
-#include "sapi/tpm20.h"
+#include "tpm20.h"
/**
*/
diff --git a/test/integration/asymmetric-encrypt-decrypt.int.c b/test/integration/asymmetric-encrypt-decrypt.int.c
index 7e9e990..3c3e17d 100644
--- a/test/integration/asymmetric-encrypt-decrypt.int.c
+++ b/test/integration/asymmetric-encrypt-decrypt.int.c
@@ -2,7 +2,7 @@
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sapi-util.h"
/**
* This program contains integration test for asymetric encrypt and
diff --git a/test/integration/command-cancel.int.c b/test/integration/command-cancel.int.c
index 5e46bdd..63a9959 100644
--- a/test/integration/command-cancel.int.c
+++ b/test/integration/command-cancel.int.c
@@ -23,7 +23,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "tcti/tcti_mssim.h"
+#include "tss2_tcti_mssim.h"
#define LOGMODULE test
#include "log/log.h"
#include "sapi-util.h"
diff --git a/test/integration/context-util.c b/test/integration/context-util.c
index 726a1fb..44721c9 100644
--- a/test/integration/context-util.c
+++ b/test/integration/context-util.c
@@ -3,8 +3,8 @@
#include <stdio.h>
#include <string.h>
-#include "tcti/tcti_device.h"
-#include "tcti/tcti_mssim.h"
+#include "tss2_tcti_device.h"
+#include "tss2_tcti_mssim.h"
#include "context-util.h"
diff --git a/test/integration/context-util.h b/test/integration/context-util.h
index bd78568..778c999 100644
--- a/test/integration/context-util.h
+++ b/test/integration/context-util.h
@@ -1,7 +1,7 @@
#ifndef CONTEXT_UTIL_H
#define CONTEXT_UTIL_H
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "test-options.h"
/**
diff --git a/test/integration/esys-clear.int.c b/test/integration/esys-clear.int.c
index fbebf69..a1d3f9a 100644
--- a/test/integration/esys-clear.int.c
+++ b/test/integration/esys-clear.int.c
@@ -34,12 +34,12 @@
#include <stdint.h>
#include <gcrypt.h>
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
#include "sysapi_util.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_types.h"
#include "esys_iutil.h"
diff --git a/test/integration/esys-clockset.int.c b/test/integration/esys-clockset.int.c
index 357d1cf..a8f9e0f 100644
--- a/test/integration/esys-clockset.int.c
+++ b/test/integration/esys-clockset.int.c
@@ -33,12 +33,12 @@
#include <signal.h>
#include <stdint.h>
#include <gcrypt.h>
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
#include "sysapi_util.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_types.h"
#include "esys_iutil.h"
diff --git a/test/integration/esys-create-fail.int.c b/test/integration/esys-create-fail.int.c
index 02b4822..5769097 100644
--- a/test/integration/esys-create-fail.int.c
+++ b/test/integration/esys-create-fail.int.c
@@ -32,12 +32,12 @@
#include <string.h>
#include <signal.h>
#include <stdint.h>
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
#include "sysapi_util.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_types.h"
#include "esys_iutil.h"
#include "test-esapi.h"
diff --git a/test/integration/esys-create-password-auth.int.c b/test/integration/esys-create-password-auth.int.c
index 9f22d2c..cdd51d9 100644
--- a/test/integration/esys-create-password-auth.int.c
+++ b/test/integration/esys-create-password-auth.int.c
@@ -32,12 +32,12 @@
#include <string.h>
#include <signal.h>
#include <stdint.h>
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
#include "sysapi_util.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_types.h"
#include "esys_iutil.h"
diff --git a/test/integration/esys-create-primary-hmac.int.c b/test/integration/esys-create-primary-hmac.int.c
index 7518e3d..7ef691b 100644
--- a/test/integration/esys-create-primary-hmac.int.c
+++ b/test/integration/esys-create-primary-hmac.int.c
@@ -34,12 +34,12 @@
#include <stdint.h>
#include <gcrypt.h>
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
#include "sysapi_util.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_types.h"
#include "esys_iutil.h"
diff --git a/test/integration/esys-create-session-auth.int.c b/test/integration/esys-create-session-auth.int.c
index 272111c..72dc2a1 100644
--- a/test/integration/esys-create-session-auth.int.c
+++ b/test/integration/esys-create-session-auth.int.c
@@ -32,12 +32,12 @@
#include <string.h>
#include <signal.h>
#include <stdint.h>
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
#include "sysapi_util.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_types.h"
#include "esys_iutil.h"
diff --git a/test/integration/esys-createloaded.int.c b/test/integration/esys-createloaded.int.c
index 0459ef7..5f08c2a 100644
--- a/test/integration/esys-createloaded.int.c
+++ b/test/integration/esys-createloaded.int.c
@@ -32,12 +32,12 @@
#include <string.h>
#include <signal.h>
#include <stdint.h>
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
#include "sysapi_util.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_types.h"
#include "esys_iutil.h"
diff --git a/test/integration/esys-evict-control-serialization.int.c b/test/integration/esys-evict-control-serialization.int.c
index 1bbaf54..f71fcd3 100644
--- a/test/integration/esys-evict-control-serialization.int.c
+++ b/test/integration/esys-evict-control-serialization.int.c
@@ -32,12 +32,12 @@
#include <string.h>
#include <signal.h>
#include <stdint.h>
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
#include "sysapi_util.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_types.h"
#include "esys_iutil.h"
diff --git a/test/integration/esys-get-capability.int.c b/test/integration/esys-get-capability.int.c
index e4bc3aa..092b385 100644
--- a/test/integration/esys-get-capability.int.c
+++ b/test/integration/esys-get-capability.int.c
@@ -32,12 +32,12 @@
#include <string.h>
#include <signal.h>
#include <stdint.h>
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
#include "sysapi_util.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_types.h"
#include "esys_iutil.h"
diff --git a/test/integration/esys-get-random.int.c b/test/integration/esys-get-random.int.c
index 7733bbc..71b7a3c 100644
--- a/test/integration/esys-get-random.int.c
+++ b/test/integration/esys-get-random.int.c
@@ -34,12 +34,12 @@
#include <stdint.h>
#include <gcrypt.h>
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
#include "sysapi_util.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_types.h"
#include "esys_iutil.h"
diff --git a/test/integration/esys-hashsequencestart.int.c b/test/integration/esys-hashsequencestart.int.c
index 6a6b716..230895b 100644
--- a/test/integration/esys-hashsequencestart.int.c
+++ b/test/integration/esys-hashsequencestart.int.c
@@ -34,12 +34,12 @@
#include <stdint.h>
#include <gcrypt.h>
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
#include "sysapi_util.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_types.h"
#include "esys_iutil.h"
diff --git a/test/integration/esys-hierarchychangeauth.int.c b/test/integration/esys-hierarchychangeauth.int.c
index 45bd5bd..2a61c6f 100644
--- a/test/integration/esys-hierarchychangeauth.int.c
+++ b/test/integration/esys-hierarchychangeauth.int.c
@@ -25,15 +25,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*******************************************************************************/
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#ifndef TSS2_API_VERSION_1_2_1_108
#error Version missmatch among TSS2 header files !
#endif /* TSS2_API_VERSION_1_2_1_108 */
#include "esys_types.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_iutil.h"
#include "esys_mu.h"
-#include <sapi/tss2_sys.h>
+#include "tss2_sys.h"
#define LOGMODULE esys
#include "log/log.h"
diff --git a/test/integration/esys-hmacsequencestart.int.c b/test/integration/esys-hmacsequencestart.int.c
index 65b6a6c..5ee7f2b 100644
--- a/test/integration/esys-hmacsequencestart.int.c
+++ b/test/integration/esys-hmacsequencestart.int.c
@@ -34,12 +34,12 @@
#include <stdint.h>
#include <gcrypt.h>
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
#include "sysapi_util.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_types.h"
#include "esys_iutil.h"
diff --git a/test/integration/esys-make-credential.int.c b/test/integration/esys-make-credential.int.c
index 2df8c2a..521c5b2 100644
--- a/test/integration/esys-make-credential.int.c
+++ b/test/integration/esys-make-credential.int.c
@@ -32,12 +32,12 @@
#include <string.h>
#include <signal.h>
#include <stdint.h>
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
#include "sysapi_util.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_types.h"
#include "esys_iutil.h"
diff --git a/test/integration/esys-nv-ram-counter.int.c b/test/integration/esys-nv-ram-counter.int.c
index 5c0fa67..c42f5ef 100644
--- a/test/integration/esys-nv-ram-counter.int.c
+++ b/test/integration/esys-nv-ram-counter.int.c
@@ -32,12 +32,12 @@
#include <string.h>
#include <signal.h>
#include <stdint.h>
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
#include "sysapi_util.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_types.h"
#include "esys_iutil.h"
diff --git a/test/integration/esys-nv-ram-extend-index.int.c b/test/integration/esys-nv-ram-extend-index.int.c
index 2c9cb6a..f707994 100644
--- a/test/integration/esys-nv-ram-extend-index.int.c
+++ b/test/integration/esys-nv-ram-extend-index.int.c
@@ -32,12 +32,12 @@
#include <string.h>
#include <signal.h>
#include <stdint.h>
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
#include "sysapi_util.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_types.h"
#include "esys_iutil.h"
diff --git a/test/integration/esys-nv-ram-ordinary-index.int.c b/test/integration/esys-nv-ram-ordinary-index.int.c
index e31586c..48412e9 100644
--- a/test/integration/esys-nv-ram-ordinary-index.int.c
+++ b/test/integration/esys-nv-ram-ordinary-index.int.c
@@ -32,12 +32,12 @@
#include <string.h>
#include <signal.h>
#include <stdint.h>
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
#include "sysapi_util.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_types.h"
#include "esys_iutil.h"
#include "test-esapi.h"
diff --git a/test/integration/esys-nv-ram-set-bits.int.c b/test/integration/esys-nv-ram-set-bits.int.c
index b3bd533..d626c19 100644
--- a/test/integration/esys-nv-ram-set-bits.int.c
+++ b/test/integration/esys-nv-ram-set-bits.int.c
@@ -32,12 +32,12 @@
#include <string.h>
#include <signal.h>
#include <stdint.h>
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
#include "sysapi_util.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_types.h"
#include "esys_iutil.h"
diff --git a/test/integration/esys-object-changeauth.int.c b/test/integration/esys-object-changeauth.int.c
index 3ce9eea..b4ceefb 100644
--- a/test/integration/esys-object-changeauth.int.c
+++ b/test/integration/esys-object-changeauth.int.c
@@ -32,12 +32,12 @@
#include <string.h>
#include <signal.h>
#include <stdint.h>
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
#include "sysapi_util.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_types.h"
#include "esys_iutil.h"
diff --git a/test/integration/esys-policy-nv-changeauth.int.c b/test/integration/esys-policy-nv-changeauth.int.c
index 19234db..8f862e6 100644
--- a/test/integration/esys-policy-nv-changeauth.int.c
+++ b/test/integration/esys-policy-nv-changeauth.int.c
@@ -32,12 +32,12 @@
#include <string.h>
#include <signal.h>
#include <stdint.h>
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
#include "sysapi_util.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_types.h"
#include "esys_iutil.h"
diff --git a/test/integration/esys-policy-password.int.c b/test/integration/esys-policy-password.int.c
index 4d0eded..370f7d5 100644
--- a/test/integration/esys-policy-password.int.c
+++ b/test/integration/esys-policy-password.int.c
@@ -32,12 +32,12 @@
#include <string.h>
#include <signal.h>
#include <stdint.h>
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
#include "sysapi_util.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_types.h"
#include "esys_iutil.h"
diff --git a/test/integration/esys-quote.int.c b/test/integration/esys-quote.int.c
index 68db836..1278e52 100644
--- a/test/integration/esys-quote.int.c
+++ b/test/integration/esys-quote.int.c
@@ -32,12 +32,12 @@
#include <string.h>
#include <signal.h>
#include <stdint.h>
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
#include "sysapi_util.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_types.h"
#include "esys_iutil.h"
diff --git a/test/integration/esys-rsa-encrypt-decrypt.int.c b/test/integration/esys-rsa-encrypt-decrypt.int.c
index e77b9f2..87d1cde 100644
--- a/test/integration/esys-rsa-encrypt-decrypt.int.c
+++ b/test/integration/esys-rsa-encrypt-decrypt.int.c
@@ -32,12 +32,12 @@
#include <string.h>
#include <signal.h>
#include <stdint.h>
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
#include "sysapi_util.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_types.h"
#include "esys_iutil.h"
diff --git a/test/integration/esys-save-and-load-context.int.c b/test/integration/esys-save-and-load-context.int.c
index 77fbc49..327a19b 100644
--- a/test/integration/esys-save-and-load-context.int.c
+++ b/test/integration/esys-save-and-load-context.int.c
@@ -32,12 +32,12 @@
#include <string.h>
#include <signal.h>
#include <stdint.h>
-#include <sapi/tpm20.h>
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
#include "sysapi_util.h"
-#include <esapi/tss2_esys.h>
+#include "tss2_esys.h"
#include "esys_types.h"
#include "esys_iutil.h"
diff --git a/test/integration/get-random.int.c b/test/integration/get-random.int.c
index 5c1ab78..602ba63 100644
--- a/test/integration/get-random.int.c
+++ b/test/integration/get-random.int.c
@@ -2,7 +2,7 @@
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
-#include "sapi/tpm20.h"
+#include "tpm20.h"
/**
* This program contains integration test for SAPI Tss2_Sys_GetRandom.
diff --git a/test/integration/hierarchy-change-auth.int.c b/test/integration/hierarchy-change-auth.int.c
index 95006d7..ce27374 100644
--- a/test/integration/hierarchy-change-auth.int.c
+++ b/test/integration/hierarchy-change-auth.int.c
@@ -3,7 +3,7 @@
#include "log/log.h"
#include "sapi-util.h"
#include "test.h"
-#include "sapi/tpm20.h"
+#include "tpm20.h"
/*
* Test auth value changes for Owner Auth
diff --git a/test/integration/main-esapi.c b/test/integration/main-esapi.c
index 8f9774b..f5ff933 100644
--- a/test/integration/main-esapi.c
+++ b/test/integration/main-esapi.c
@@ -5,11 +5,11 @@
#include "test-esapi.h"
#include "test-options.h"
#include "context-util.h"
-#include <esapi/tss2_esys.h>
-#include <esys_types.h>
+#include "tss2_esys.h"
+#include "esys_types.h"
#include "esys_iutil.h"
+#include "tss2_tcti.h"
#include "tcti/tcti.h"
-#include "sapi/tss2_tcti.h"
/** Define a proxy tcti that returns yielded on every second invocation
* thus the corresponding handling code in ESAPI can be tested.
diff --git a/test/integration/pcr-extension.int.c b/test/integration/pcr-extension.int.c
index 3e89f14..8f3d069 100644
--- a/test/integration/pcr-extension.int.c
+++ b/test/integration/pcr-extension.int.c
@@ -2,7 +2,7 @@
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
#define PCR_8 8
/**
diff --git a/test/integration/policy-authorizeNV.int.c b/test/integration/policy-authorizeNV.int.c
index c9f64c9..22d0462 100644
--- a/test/integration/policy-authorizeNV.int.c
+++ b/test/integration/policy-authorizeNV.int.c
@@ -2,7 +2,7 @@
#include <stdio.h>
#include <openssl/rand.h>
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
diff --git a/test/integration/policy-template.int.c b/test/integration/policy-template.int.c
index 479f80f..2b59fd7 100644
--- a/test/integration/policy-template.int.c
+++ b/test/integration/policy-template.int.c
@@ -1,7 +1,7 @@
#include <inttypes.h>
#include <stdio.h>
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
diff --git a/test/integration/sapi-util.h b/test/integration/sapi-util.h
index 921cfd6..b54cb2e 100644
--- a/test/integration/sapi-util.h
+++ b/test/integration/sapi-util.h
@@ -26,7 +26,7 @@
#ifndef TEST_INTEGRATION_SAPI_UTIL_H
#define TEST_INTEGRATION_SAPI_UTIL_H
-#include "sapi/tpm20.h"
+#include "tpm20.h"
/*
* This macro is like the GNU TEMP_FAILURE_RETRY macro for the
* TPM2_RC_RETRY response code.
diff --git a/test/integration/self-test.int.c b/test/integration/self-test.int.c
index 6fe7d22..d80d435 100644
--- a/test/integration/self-test.int.c
+++ b/test/integration/self-test.int.c
@@ -2,7 +2,7 @@
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
-#include "sapi/tpm20.h"
+#include "tpm20.h"
/*
* This program contains integration test for SAPI Tss2_Sys_SelfTest
diff --git a/test/integration/start-auth-session.int.c b/test/integration/start-auth-session.int.c
index 6207919..4d7a28a 100644
--- a/test/integration/start-auth-session.int.c
+++ b/test/integration/start-auth-session.int.c
@@ -1,7 +1,7 @@
#include <inttypes.h>
#include <stdio.h>
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#define LOGMODULE test
#include "log/log.h"
diff --git a/test/integration/sys-initialize.int.c b/test/integration/sys-initialize.int.c
index fb60ff3..2625642 100644
--- a/test/integration/sys-initialize.int.c
+++ b/test/integration/sys-initialize.int.c
@@ -2,7 +2,7 @@
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "tcti/tcti.h"
#include "sysapi/include/sysapi_util.h"
diff --git a/test/integration/system-api.int.c b/test/integration/system-api.int.c
index fdf886b..2d7f4de 100644
--- a/test/integration/system-api.int.c
+++ b/test/integration/system-api.int.c
@@ -2,7 +2,7 @@
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sapi-util.h"
/*
diff --git a/test/integration/test-esapi.h b/test/integration/test-esapi.h
index b99f52d..54ee096 100644
--- a/test/integration/test-esapi.h
+++ b/test/integration/test-esapi.h
@@ -1,5 +1,5 @@
-#include "sapi/tpm20.h"
-#include <esapi/tss2_esys.h>
+#include "tpm20.h"
+#include "tss2_esys.h"
#define goto_error_if_not_failed(rc,msg,label) \
if (rc == TSS2_RC_SUCCESS) { \
diff --git a/test/integration/test-options.h b/test/integration/test-options.h
index d7983a7..27c4c97 100644
--- a/test/integration/test-options.h
+++ b/test/integration/test-options.h
@@ -1,7 +1,7 @@
#ifndef TEST_OPTIONS_H
#define TEST_OPTIONS_H
-#include "sapi/tpm20.h"
+#include "tpm20.h"
/* Default TCTI */
#define TCTI_DEFAULT SOCKET_TCTI
diff --git a/test/integration/test.h b/test/integration/test.h
index df7380f..d3bd459 100644
--- a/test/integration/test.h
+++ b/test/integration/test.h
@@ -1,4 +1,4 @@
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#define YES 1
#define NO 0
diff --git a/test/integration/tpm-properties.int.c b/test/integration/tpm-properties.int.c
index d388bbe..77ced8d 100644
--- a/test/integration/tpm-properties.int.c
+++ b/test/integration/tpm-properties.int.c
@@ -2,7 +2,7 @@
#define LOGMODULE test
#include "log/log.h"
#include "test.h"
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
int
diff --git a/test/tpmclient/CatSizedByteBuffer.c b/test/tpmclient/CatSizedByteBuffer.c
index bc62830..2396dc9 100644
--- a/test/tpmclient/CatSizedByteBuffer.c
+++ b/test/tpmclient/CatSizedByteBuffer.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
void CatSizedByteBuffer( TPM2B *dest, TPM2B *src )
{
diff --git a/test/tpmclient/CopySizedBuffer.c b/test/tpmclient/CopySizedBuffer.c
index 00e7543..0d9137c 100644
--- a/test/tpmclient/CopySizedBuffer.c
+++ b/test/tpmclient/CopySizedBuffer.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
UINT16 CopySizedByteBuffer( TPM2B *dest, TPM2B *src )
{
diff --git a/test/tpmclient/CreateNullSession.c b/test/tpmclient/CreateNullSession.c
index 9576b72..c0aa15e 100644
--- a/test/tpmclient/CreateNullSession.c
+++ b/test/tpmclient/CreateNullSession.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/test/tpmclient/DecryptEncrypt.c b/test/tpmclient/DecryptEncrypt.c
index b533b05..fc49555 100644
--- a/test/tpmclient/DecryptEncrypt.c
+++ b/test/tpmclient/DecryptEncrypt.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sample.h"
#include <string.h>
diff --git a/test/tpmclient/Entity.c b/test/tpmclient/Entity.c
index 0e3e55b..90ec23e 100644
--- a/test/tpmclient/Entity.c
+++ b/test/tpmclient/Entity.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sample.h"
#include "sysapi_util.h"
diff --git a/test/tpmclient/LoadExternalHMACKey.c b/test/tpmclient/LoadExternalHMACKey.c
index 8512dc6..86213df 100644
--- a/test/tpmclient/LoadExternalHMACKey.c
+++ b/test/tpmclient/LoadExternalHMACKey.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
#include "sample.h"
diff --git a/test/tpmclient/SessionHmac.c b/test/tpmclient/SessionHmac.c
index 29db72d..ca4b741 100644
--- a/test/tpmclient/SessionHmac.c
+++ b/test/tpmclient/SessionHmac.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sample.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/test/tpmclient/SetLocality.c b/test/tpmclient/SetLocality.c
index 4dd0e10..5a1ceea 100644
--- a/test/tpmclient/SetLocality.c
+++ b/test/tpmclient/SetLocality.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sample.h"
#include "../integration/sapi-util.h"
diff --git a/test/tpmclient/StartAuthSession.c b/test/tpmclient/StartAuthSession.c
index 9549cb5..1b5866b 100644
--- a/test/tpmclient/StartAuthSession.c
+++ b/test/tpmclient/StartAuthSession.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sample.h"
#include "../integration/sapi-util.h"
#include <stdlib.h>
diff --git a/test/tpmclient/TpmCalcPHash.c b/test/tpmclient/TpmCalcPHash.c
index 48a96c4..98fc7ca 100644
--- a/test/tpmclient/TpmCalcPHash.c
+++ b/test/tpmclient/TpmCalcPHash.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sample.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/test/tpmclient/TpmHandleToName.c b/test/tpmclient/TpmHandleToName.c
index eaf9d34..7c58254 100644
--- a/test/tpmclient/TpmHandleToName.c
+++ b/test/tpmclient/TpmHandleToName.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sample.h"
#include "sysapi_util.h"
#include "tss2_endian.h"
diff --git a/test/tpmclient/TpmHash.c b/test/tpmclient/TpmHash.c
index 531ccd6..3c8fb6f 100644
--- a/test/tpmclient/TpmHash.c
+++ b/test/tpmclient/TpmHash.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sample.h"
#include "sysapi_util.h"
diff --git a/test/tpmclient/TpmHmac.c b/test/tpmclient/TpmHmac.c
index 90882d8..a728bbb 100644
--- a/test/tpmclient/TpmHmac.c
+++ b/test/tpmclient/TpmHmac.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sample.h"
#include "sysapi_util.h"
diff --git a/test/tpmclient/kdfa.c b/test/tpmclient/kdfa.c
index cc269db..3cb532b 100644
--- a/test/tpmclient/kdfa.c
+++ b/test/tpmclient/kdfa.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sample.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/test/tpmclient/sample.h b/test/tpmclient/sample.h
index cc538a0..71a80d9 100644
--- a/test/tpmclient/sample.h
+++ b/test/tpmclient/sample.h
@@ -33,7 +33,7 @@
#endif
-#include "sapi/tss2_tpm2_types.h"
+#include "tss2_tpm2_types.h"
#include "tpmclient.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/test/tpmclient/syscontext.c b/test/tpmclient/syscontext.c
index b3c0490..4b0fce7 100644
--- a/test/tpmclient/syscontext.c
+++ b/test/tpmclient/syscontext.c
@@ -25,7 +25,7 @@
// THE POSSIBILITY OF SUCH DAMAGE.
//**********************************************************************;
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include <stdio.h>
#include <stdlib.h>
#include "sysapi_util.h"
diff --git a/test/tpmclient/syscontext.h b/test/tpmclient/syscontext.h
index 5f5ea9a..70b48c3 100644
--- a/test/tpmclient/syscontext.h
+++ b/test/tpmclient/syscontext.h
@@ -28,7 +28,7 @@
#ifndef SYS_CONTEXT_H
#define SYS_CONTEXT_H
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include <stdio.h>
#include <stdlib.h>
#include "sysapi_util.h"
diff --git a/test/tpmclient/tpmclient.int.c b/test/tpmclient/tpmclient.int.c
index 86d7fa6..fe436fb 100644
--- a/test/tpmclient/tpmclient.int.c
+++ b/test/tpmclient/tpmclient.int.c
@@ -31,15 +31,16 @@
#include <stdlib.h>
#include <string.h>
-#include "sapi/tpm20.h"
+#include "tpm20.h"
+#include "tss2_tcti_device.h"
+#include "tss2_tcti_mssim.h"
+
#include "../integration/context-util.h"
#include "../integration/sapi-util.h"
#include "sample.h"
#include "tpmclient.h"
#include "tss2_endian.h"
#include "sysapi_util.h"
-#include "tcti/tcti_device.h"
-#include "tcti/tcti_mssim.h"
#include "syscontext.h"
#define LOGMODULE testtpmclient
#include "log/log.h"
diff --git a/test/unit/CommonPreparePrologue.c b/test/unit/CommonPreparePrologue.c
index 7f66287..b4fee9a 100644
--- a/test/unit/CommonPreparePrologue.c
+++ b/test/unit/CommonPreparePrologue.c
@@ -4,7 +4,7 @@
#include <setjmp.h>
#include <cmocka.h>
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
#define MAX_SIZE_CTX 4096
diff --git a/test/unit/CopyCommandHeader.c b/test/unit/CopyCommandHeader.c
index 1f46b2e..7a27f5a 100644
--- a/test/unit/CopyCommandHeader.c
+++ b/test/unit/CopyCommandHeader.c
@@ -5,7 +5,7 @@
#include <setjmp.h>
#include <cmocka.h>
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
#define MAX_SIZE_CTX 4096
diff --git a/test/unit/GetNumHandles.c b/test/unit/GetNumHandles.c
index 6061a6f..d57d2ea 100644
--- a/test/unit/GetNumHandles.c
+++ b/test/unit/GetNumHandles.c
@@ -4,7 +4,7 @@
#include <setjmp.h>
#include <cmocka.h>
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "sysapi_util.h"
/**
diff --git a/test/unit/TPM2B-marshal.c b/test/unit/TPM2B-marshal.c
index b0cedd2..bd367bd 100644
--- a/test/unit/TPM2B-marshal.c
+++ b/test/unit/TPM2B-marshal.c
@@ -3,7 +3,7 @@
#include <string.h>
#include <setjmp.h>
#include <cmocka.h>
-#include "sapi/tss2_mu.h"
+#include "tss2_mu.h"
#include "marshal/tss2_endian.h"
/*
diff --git a/test/unit/TPMA-marshal.c b/test/unit/TPMA-marshal.c
index 72b3f7e..d41cf18 100644
--- a/test/unit/TPMA-marshal.c
+++ b/test/unit/TPMA-marshal.c
@@ -3,7 +3,7 @@
#include <setjmp.h>
#include <cmocka.h>
#include <stdio.h>
-#include "sapi/tss2_mu.h"
+#include "tss2_mu.h"
#include "marshal/tss2_endian.h"
/*
diff --git a/test/unit/TPML-marshal.c b/test/unit/TPML-marshal.c
index 17900b1..9436449 100644
--- a/test/unit/TPML-marshal.c
+++ b/test/unit/TPML-marshal.c
@@ -4,7 +4,7 @@
#include <setjmp.h>
#include <cmocka.h>
#include <stdio.h>
-#include "sapi/tss2_mu.h"
+#include "tss2_mu.h"
#include "marshal/tss2_endian.h"
/*
diff --git a/test/unit/TPMS-marshal.c b/test/unit/TPMS-marshal.c
index f777cc5..4ffe594 100644
--- a/test/unit/TPMS-marshal.c
+++ b/test/unit/TPMS-marshal.c
@@ -3,7 +3,7 @@
#include <setjmp.h>
#include <cmocka.h>
#include <stdio.h>
-#include "sapi/tss2_mu.h"
+#include "tss2_mu.h"
#include "marshal/tss2_endian.h"
/*
diff --git a/test/unit/TPMT-marshal.c b/test/unit/TPMT-marshal.c
index f2e826d..cac2d25 100644
--- a/test/unit/TPMT-marshal.c
+++ b/test/unit/TPMT-marshal.c
@@ -3,7 +3,7 @@
#include <setjmp.h>
#include <cmocka.h>
#include <stdio.h>
-#include "sapi/tss2_mu.h"
+#include "tss2_mu.h"
#include "marshal/tss2_endian.h"
/*
diff --git a/test/unit/TPMU-marshal.c b/test/unit/TPMU-marshal.c
index 6d6da05..57da9f2 100644
--- a/test/unit/TPMU-marshal.c
+++ b/test/unit/TPMU-marshal.c
@@ -4,7 +4,7 @@
#include <setjmp.h>
#include <cmocka.h>
#include <stdio.h>
-#include "sapi/tss2_mu.h"
+#include "tss2_mu.h"
#include "marshal/tss2_endian.h"
/*
diff --git a/test/unit/UINT16-marshal.c b/test/unit/UINT16-marshal.c
index cfcfacb..e7a883b 100644
--- a/test/unit/UINT16-marshal.c
+++ b/test/unit/UINT16-marshal.c
@@ -4,7 +4,7 @@
#include <setjmp.h>
#include <cmocka.h>
-#include "sapi/tss2_mu.h"
+#include "tss2_mu.h"
/*
* Test case for successful UINT16 marshaling with NULL offset.
diff --git a/test/unit/UINT32-marshal.c b/test/unit/UINT32-marshal.c
index 20f8531..bfa270a 100644
--- a/test/unit/UINT32-marshal.c
+++ b/test/unit/UINT32-marshal.c
@@ -4,7 +4,7 @@
#include <setjmp.h>
#include <cmocka.h>
-#include "sapi/tss2_mu.h"
+#include "tss2_mu.h"
#include "tss2_endian.h"
/*
diff --git a/test/unit/UINT64-marshal.c b/test/unit/UINT64-marshal.c
index 3f2bc54..8e006b0 100644
--- a/test/unit/UINT64-marshal.c
+++ b/test/unit/UINT64-marshal.c
@@ -4,7 +4,7 @@
#include <setjmp.h>
#include <cmocka.h>
-#include "sapi/tss2_mu.h"
+#include "tss2_mu.h"
#include "tss2_endian.h"
/*
diff --git a/test/unit/UINT8-marshal.c b/test/unit/UINT8-marshal.c
index 4c94f3e..83be3ec 100644
--- a/test/unit/UINT8-marshal.c
+++ b/test/unit/UINT8-marshal.c
@@ -4,7 +4,7 @@
#include <setjmp.h>
#include <cmocka.h>
-#include "sapi/tss2_mu.h"
+#include "tss2_mu.h"
/*
* Test case for successful UINT8 marshaling with NULL offset.
diff --git a/test/unit/socket.c b/test/unit/socket.c
index 759181a..53d1cd3 100644
--- a/test/unit/socket.c
+++ b/test/unit/socket.c
@@ -31,7 +31,7 @@
#include <setjmp.h>
#include <cmocka.h>
-#include "sapi/tpm20.h"
+#include "tpm20.h"
#include "tcti/sockets.h"
int
diff --git a/test/unit/tcti-device.c b/test/unit/tcti-device.c
index 09788fc..14c9509 100644
--- a/test/unit/tcti-device.c
+++ b/test/unit/tcti-device.c
@@ -5,8 +5,8 @@
#include <setjmp.h>
#include <cmocka.h>
-#include "sapi/tss2_mu.h"
-#include "tcti/tcti_device.h"
+#include "tss2_mu.h"
+#include "tss2_tcti_device.h"
#include "tcti/tcti.h"
/**
diff --git a/test/unit/tcti-mssim.c b/test/unit/tcti-mssim.c
index c16673c..a6fdcab 100644
--- a/test/unit/tcti-mssim.c
+++ b/test/unit/tcti-mssim.c
@@ -33,9 +33,9 @@
#include <setjmp.h>
#include <cmocka.h>
-#include "sapi/tpm20.h"
+#include "tpm20.h"
+#include "tss2_tcti_mssim.h"
#include "tcti/tcti.h"
-#include "tcti/tcti_mssim.h"
/*
* This function is implemented in the socket TCTI module but not exposed