Merge branch 'master' of https://github.com/01org/TPM2.0-TSS
diff --git a/Makefile.am b/Makefile.am
index eafc1ab..f11ec72 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,9 +37,9 @@
# headers and where to install them
libtpm2sapidir = $(includedir)/tpm2sapi
-libtpm2sapi_HEADERS = $(SYSAPI_H)
+libtpm2sapi_HEADERS = $(srcdir)/include/tpm2sapi/*.h
libtpm2tctidir = $(includedir)/tpm2tcti
-libtpm2tcti_HEADERS = $(LOCALTPM_H) $(TPMSOCKETS_H)
+libtpm2tcti_HEADERS = $(srcdir)/include/tpm2tcti/*.h
# how to build stuff
resourcemgr_resourcemgr_CFLAGS = $(RESOURCEMGR_INC) $(PTHREAD_CFLAGS)
@@ -49,13 +49,13 @@
resourcemgr_resourcemgr_SOURCES = $(RESOURCEMGR_C) $(TPMSOCKETS_CXX) \
$(COMMON_C) $(COMMONTCTI_C) $(LOCALTPM_C)
-sysapi_libtpm2sapi_la_CFLAGS = -I$(srcdir)/sysapi/include/
+sysapi_libtpm2sapi_la_CFLAGS = -I$(srcdir)/include/tpm2sapi
sysapi_libtpm2sapi_la_SOURCES = $(SYSAPI_C) $(SYSAPIUTIL_C)
-tcti_libtpm2tctidev_la_CFLAGS = -DSAPI_CLIENT $(TCTIDEV_INC) $(COMMONTCTI_INC)
+tcti_libtpm2tctidev_la_CFLAGS = -DSAPI_CLIENT $(TCTIDEV_INC)
tcti_libtpm2tctidev_la_SOURCES = common/debug.c $(LOCALTPM_C) $(COMMONTCTI_C)
-tcti_libtpm2tctisock_la_CFLAGS = -DSAPI_CLIENT $(TCTISOCK_INC) $(COMMONTCTI_INC)
+tcti_libtpm2tctisock_la_CFLAGS = -DSAPI_CLIENT $(TCTISOCK_INC)
tcti_libtpm2tctisock_la_CXXFLAGS = -DSAPI_CLIENT $(TCTISOCK_INC)
tcti_libtpm2tctisock_la_SOURCES = common/debug.c $(TPMSOCKETS_CXX) $(COMMONTCTI_C)
@@ -70,28 +70,25 @@
test_tpmtest_tpmtest_SOURCES = $(TPMTEST_CXX) $(COMMON_C) $(SAMPLE_C)
# simple variables
-RESOURCEMGR_INC = -I$(srcdir)/sysapi/include -I$(srcdir)/common \
- -I$(srcdir)/tcti/tpmsockets -I$(srcdir)/tcti/localtpm \
+RESOURCEMGR_INC = -I$(srcdir)/include/tpm2sapi -I$(srcdir)/common \
+ -I$(srcdir)/include/tpm2tcti \
-I$(srcdir)/resourcemgr -I$(srcdir)/test/tpmclient \
-I$(srcdir)/tcti/commonTcti
RESOURCEMGR_C = resourcemgr/resourcemgr.c
-COMMONTTCTI_INC = -I$(srcdir)/sysapi/include -I$(srcdir)/common \
- -I$(srcdir)/tcti/localtpm -I$(srcdir)/tcti/commonTcti
+COMMONTCTI_INC = -I$(srcdir)/include/tpm2sapi -I$(srcdir)/common \
+ -I$(srcdir)/include/tpm2tcti -I$(srcdir)/tcti/commonTcti
-TCTIDEV_INC = -I$(srcdir)/sysapi/include -I$(srcdir)/common \
- -I$(srcdir)/tcti/localtpm -I$(srcdir)/tcti/commonTcti
+TCTIDEV_INC = -I$(srcdir)/tcti/localtpm $(COMMONTCTI_INC)
-TCTISOCK_INC = -I$(srcdir)/sysapi/include -I$(srcdir)/common \
- -I$(srcdir)/tcti/tpmsockets -I$(srcdir)/tcti/commonTcti
+TCTISOCK_INC = -I$(srcdir)/tcti/tpmsockets $(COMMONTCTI_INC)
-TPMCLIENT_INC = -I$(srcdir)/sysapi/include -I$(srcdir)/tcti/tpmsockets \
+TPMCLIENT_INC = -I$(srcdir)/include/tpm2sapi -I$(srcdir)/include/tpm2tcti \
-I$(srcdir)/test/tpmclient -I$(srcdir)/common \
- -I$(srcdir)/test/common/sample -I$(srcdir)/resourcemgr \
- -I$(srcdir)/tcti/localtpm
+ -I$(srcdir)/test/common/sample -I$(srcdir)/resourcemgr
TPMCLIENT_CXX = test/tpmclient/tpmclient.cpp
-TPMTEST_INC = -I$(srcdir)/sysapi/include -I$(srcdir)/tcti/tpmsockets \
+TPMTEST_INC = -I$(srcdir)/include/tpm2sapi -I$(srcdir)/include/tpm2tcti \
-I$(srcdir)/test/tpmclient -I$(srcdir)/common \
-I$(srcdir)/test/common/sample -I$(srcdir)/resourcemgr
TPMTEST_CXX = test/tpmtest/tpmtest.cpp
diff --git a/bootstrap b/bootstrap
index 8f4eb03..7627c98 100755
--- a/bootstrap
+++ b/bootstrap
@@ -16,7 +16,6 @@
echo "Generating file lists: ${VARS_FILE}"
(
- src_listvar "sysapi/include" "*.h" "SYSAPI_H"
src_listvar "sysapi/sysapi" "*.c" "SYSAPI_C"
src_listvar "sysapi/sysapi_util" "*.c" "SYSAPIUTIL_C"
printf "SYSAPI_SRC = \$(SYSAPI_H) \$(SYSAPI_C) \$(SYSAPIUTIL_C)\n"
@@ -26,7 +25,6 @@
printf "COMMON_SRC = \$(COMMON_C) \$(COMMON_H)\n"
src_listvar "tcti/localtpm" "*.c" "LOCALTPM_C"
- src_listvar "tcti/localtpm" "*.h" "LOCALTPM_H"
printf "LOCALTPM_SRC = \$(LOCALTPM_C) \$(LOCALTPM_H)\n"
src_listvar "tcti/commonTcti" "*.c" "COMMONTCTI_C"
@@ -38,7 +36,6 @@
printf "SAMPLE_SRC = \$(SAMPLE_C) \$(SAMPLE_H)\n"
src_listvar "tcti/tpmsockets" "*.cpp" "TPMSOCKETS_CXX"
- src_listvar "tcti/tpmsockets" "*.h" "TPMSOCKETS_H"
printf "TPMSOCKETS_SRC = \$(TPMSOCKETS_CXX) \$(TPMSOCKETS_H)\n"
) > ${VARS_FILE}
diff --git a/sysapi/include/basetypes.h b/include/tpm2sapi/basetypes.h
similarity index 100%
rename from sysapi/include/basetypes.h
rename to include/tpm2sapi/basetypes.h
diff --git a/sysapi/include/endianConv.h b/include/tpm2sapi/endianConv.h
similarity index 100%
rename from sysapi/include/endianConv.h
rename to include/tpm2sapi/endianConv.h
diff --git a/sysapi/include/implementation.h b/include/tpm2sapi/implementation.h
similarity index 100%
rename from sysapi/include/implementation.h
rename to include/tpm2sapi/implementation.h
diff --git a/sysapi/include/tpm20.h b/include/tpm2sapi/tpm20.h
similarity index 100%
rename from sysapi/include/tpm20.h
rename to include/tpm2sapi/tpm20.h
diff --git a/sysapi/include/tpmb.h b/include/tpm2sapi/tpmb.h
similarity index 100%
rename from sysapi/include/tpmb.h
rename to include/tpm2sapi/tpmb.h
diff --git a/sysapi/include/tss2_common.h b/include/tpm2sapi/tss2_common.h
similarity index 100%
rename from sysapi/include/tss2_common.h
rename to include/tpm2sapi/tss2_common.h
diff --git a/sysapi/include/tss2_sys.h b/include/tpm2sapi/tss2_sys.h
similarity index 100%
rename from sysapi/include/tss2_sys.h
rename to include/tpm2sapi/tss2_sys.h
diff --git a/sysapi/include/tss2_sys_api_marshalUnmarshal.h b/include/tpm2sapi/tss2_sys_api_marshalUnmarshal.h
similarity index 100%
rename from sysapi/include/tss2_sys_api_marshalUnmarshal.h
rename to include/tpm2sapi/tss2_sys_api_marshalUnmarshal.h
diff --git a/sysapi/include/tss2_sys_api_part3.h b/include/tpm2sapi/tss2_sys_api_part3.h
similarity index 100%
rename from sysapi/include/tss2_sys_api_part3.h
rename to include/tpm2sapi/tss2_sys_api_part3.h
diff --git a/sysapi/include/tss2_sysapi_util.h b/include/tpm2sapi/tss2_sysapi_util.h
similarity index 100%
rename from sysapi/include/tss2_sysapi_util.h
rename to include/tpm2sapi/tss2_sysapi_util.h
diff --git a/sysapi/include/tss2_tcti.h b/include/tpm2sapi/tss2_tcti.h
similarity index 100%
rename from sysapi/include/tss2_tcti.h
rename to include/tpm2sapi/tss2_tcti.h
diff --git a/sysapi/include/tss2_tcti_util.h b/include/tpm2sapi/tss2_tcti_util.h
similarity index 100%
rename from sysapi/include/tss2_tcti_util.h
rename to include/tpm2sapi/tss2_tcti_util.h
diff --git a/sysapi/include/tss2_tpm2_types.h b/include/tpm2sapi/tss2_tpm2_types.h
similarity index 100%
rename from sysapi/include/tss2_tpm2_types.h
rename to include/tpm2sapi/tss2_tpm2_types.h
diff --git a/tcti/localtpm/localtpm.h b/include/tpm2tcti/localtpm.h
similarity index 100%
rename from tcti/localtpm/localtpm.h
rename to include/tpm2tcti/localtpm.h
diff --git a/tcti/tpmsockets/tpmsockets.h b/include/tpm2tcti/tpmsockets.h
similarity index 100%
rename from tcti/tpmsockets/tpmsockets.h
rename to include/tpm2tcti/tpmsockets.h
diff --git a/resourcemgr/resourceMgr.vcxproj b/resourcemgr/resourceMgr.vcxproj
index fc32d1b..dff0ea3 100644
--- a/resourcemgr/resourceMgr.vcxproj
+++ b/resourcemgr/resourceMgr.vcxproj
@@ -39,7 +39,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
- <IncludePath>$(SolutionDir)tcti\commontcti;$(IncludePath);..\sysapi\include;..\test\tpmclient;..\tcti\tpmsockets;..\common;..\tcti\localtpm</IncludePath>
+ <IncludePath>$(SolutionDir)tcti\commontcti;$(IncludePath);..\include\tpm2sapi;..\test\tpmclient;..\common;..\include\tpm2tcti</IncludePath>
<OutDir>$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
diff --git a/sysapi/windows.mak b/sysapi/windows.mak
index 3671762..ff97d40 100644
--- a/sysapi/windows.mak
+++ b/sysapi/windows.mak
@@ -113,7 +113,7 @@
BASE_DIR = .
LIBRARY_DIR = .\lib
BLD_DIR = build
-INCLUDE_DIR = include
+INCLUDE_DIR = ..\include\tpm2sapi
LIBRARY = tpm.lib
@@ -167,7 +167,7 @@
-for /F %i IN (tpm_dirs.tmp) DO for /F "usebackq" %j IN (`dir /B %i\*.asm`) DO @echo. $(LIB_DIR)\%~nj.obj \>> $(BLD_DIR)\tpm_objects.tmp
@echo.>$(BLD_DIR)\tpm_depends.tmp
@echo ALL_DEPS= \> $(BLD_DIR)\tpm_depends.tmp
- @for /F "usebackq" %i IN (`dir /B $(BASE_DIR)\$(INCLUDE_DIR)`) DO @echo. $(INCLUDE_DIR)\%i \>> $(BLD_DIR)\tpm_depends.tmp
+ @for /F "usebackq" %i IN (`dir /B $(INCLUDE_DIR)`) DO @echo. $(INCLUDE_DIR)\%i \>> $(BLD_DIR)\tpm_depends.tmp
@echo. >> $(BLD_DIR)\tpm_depends.tmp
-for /F %i IN (tpm_dirs.tmp) DO for /F "usebackq" %j IN (`dir /B %i\*.c*`) DO @echo.$(LIB_DIR)\%~nj.obj: $(BASE_DIR)\%i\%j $$(ALL_DEPS) >> $(BLD_DIR)\tpm_depends.tmp && @echo. $$(CL) $(CL_FLAGS) /Fo$$^@ $(BASE_DIR)\%i\%j >> $(BLD_DIR)\tpm_depends.tmp && @echo. >> $(BLD_DIR)\tpm_depends.tmp
diff --git a/test/tpmclient/tpmclient.vcxproj b/test/tpmclient/tpmclient.vcxproj
index db598ac..62d5535 100644
--- a/test/tpmclient/tpmclient.vcxproj
+++ b/test/tpmclient/tpmclient.vcxproj
@@ -41,7 +41,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
- <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(SolutionDir)..\..\sysapi\include;$(SolutionDir)tpmclient;$(SolutionDir)tpmclient\simdriver;$(SolutionDir)resourceMgr;..\common\sample;..\..\tcti\tpmSockets;$(IncludePath);..\..\common;$(SolutionDir)sysapi\include;$(SolutionDir)tcti\commonTcti</IncludePath>
+ <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(SolutionDir)tpmclient;$(SolutionDir)tpmclient\simdriver;$(SolutionDir)resourceMgr;..\common\sample;$(SolutionDir)\include\tpm2tcti;$(IncludePath);..\..\common;$(SolutionDir)\include\tpm2sapi;$(SolutionDir)tcti\commonTcti</IncludePath>
<OutDir>$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">