From b8584accbd96e38eaea250e31ed3ea580d2bca27 Mon Sep 17 00:00:00 2001 From: Philip Tricca Date: Sat, 10 Mar 2018 17:02:30 -0800 Subject: [PATCH] build: Move TCTI code from tcti/ to src/tss2-tcti/ Minor fixups were required to 'include' statements in a few test cases as well as the pkgconfig files. Signed-off-by: Philip Tricca --- Makefile-test.am | 10 +++-- Makefile.am | 43 ++++++++++--------- lib/tcti-mssim.pc.in | 7 --- .../tss2-tcti-device.map | 0 ...ti-device.pc.in => tss2-tcti-device.pc.in} | 6 +-- lib/{tcti-mssim.map => tss2-tcti-mssim.map} | 0 lib/tss2-tcti-mssim.pc.in | 7 +++ ...tcti-device.7.in => tss2-tcti-device.7.in} | 0 man/{tcti-mssim.7.in => tss2-tcti-mssim.7.in} | 0 {tcti => src/tss2-tcti}/sockets.c | 0 {tcti => src/tss2-tcti}/sockets.h | 0 .../tss2-tcti/tcti-device.c | 0 {tcti => src/tss2-tcti}/tcti-mssim.c | 0 {tcti => src/tss2-tcti}/tcti.c | 0 {tcti => src/tss2-tcti}/tcti.h | 0 test/integration/main-esapi.c | 2 +- test/integration/sys-initialize.int.c | 2 +- test/unit/socket.c | 2 +- test/unit/tcti-device.c | 2 +- test/unit/tcti-mssim.c | 2 +- test/unit/util.c | 2 +- 21 files changed, 44 insertions(+), 41 deletions(-) delete mode 100644 lib/tcti-mssim.pc.in rename tcti/tcti_device.map => lib/tss2-tcti-device.map (100%) rename lib/{tcti-device.pc.in => tss2-tcti-device.pc.in} (67%) rename lib/{tcti-mssim.map => tss2-tcti-mssim.map} (100%) create mode 100644 lib/tss2-tcti-mssim.pc.in rename man/{tcti-device.7.in => tss2-tcti-device.7.in} (100%) rename man/{tcti-mssim.7.in => tss2-tcti-mssim.7.in} (100%) rename {tcti => src/tss2-tcti}/sockets.c (100%) rename {tcti => src/tss2-tcti}/sockets.h (100%) rename tcti/tcti_device.c => src/tss2-tcti/tcti-device.c (100%) rename {tcti => src/tss2-tcti}/tcti-mssim.c (100%) rename {tcti => src/tss2-tcti}/tcti.c (100%) rename {tcti => src/tss2-tcti}/tcti.h (100%) diff --git a/Makefile-test.am b/Makefile-test.am index 0fa7d5511..3a2bb0035 100644 --- a/Makefile-test.am +++ b/Makefile-test.am @@ -137,18 +137,20 @@ test_unit_util_SOURCES = test/unit/util.c test_unit_tcti_device_CFLAGS = $(CMOCKA_CFLAGS) $(TESTS_CFLAGS) test_unit_tcti_device_LDADD = $(CMOCKA_LIBS) $(libtss2_mu) $(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_device_SOURCES = test/unit/tcti-device.c \ + src/tss2-tcti/tcti-device.c log/log.h test_unit_tcti_mssim_CFLAGS = $(CMOCKA_CFLAGS) $(TESTS_CFLAGS) $(URIPARSER_CFLAGS) test_unit_tcti_mssim_LDADD = $(CMOCKA_LIBS) $(libtss2_mu) $(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_tcti_mssim_SOURCES = src/tss2-tcti/tcti-mssim.c src/tss2-tcti/sockets.c \ + src/tss2-tcti/sockets.h test/unit/tcti-mssim.c test_unit_socket_CFLAGS = $(CMOCKA_CFLAGS) $(TESTS_CFLAGS) test_unit_socket_LDADD = $(CMOCKA_LIBS) $(libutil) $(libtss2_mu) 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_socket_SOURCES = test/unit/socket.c src/tss2-tcti/sockets.c \ + src/tss2-tcti/sockets.h test_unit_CommonPreparePrologue_CFLAGS = $(CMOCKA_CFLAGS) $(TESTS_CFLAGS) test_unit_CommonPreparePrologue_LDFLAGS = -Wl,--unresolved-symbols=ignore-all diff --git a/Makefile.am b/Makefile.am index df3f65b3a..5897d4a7e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -94,7 +94,7 @@ tss2_HEADERS = \ libutil = libutil.la noinst_LTLIBRARIES += $(libutil) libutil_la_CFLAGS = $(AM_CFLAGS) -libutil_la_SOURCES = log/log.c log/log.h tcti/tcti.c tcti/tcti.h +libutil_la_SOURCES = log/log.c log/log.h src/tss2-tcti/tcti.c src/tss2-tcti/tcti.h ### TCG TSS Marshaling/Unmarshalling spec library ### libtss2_mu = src/tss2-mu/libtss2-mu.la @@ -111,32 +111,33 @@ src_tss2_mu_libtss2_mu_la_SOURCES = $(TSS2_MU_SRC) ### TCG TSS TCTI spec libraries ### # tcti device library -libtcti_device = tcti/libtcti-device.la +libtss2_tcti_device = src/tss2-tcti/libtss2-tcti-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 +lib_LTLIBRARIES += $(libtss2_tcti_device) +nodist_pkgconfig_DATA += lib/tss2-tcti-device.pc +EXTRA_DIST += lib/tss2-tcti-device.map lib/tss2-tcti-device.pc.in -tcti_libtcti_device_la_CFLAGS = $(AM_CFLAGS) +src_tss2_tcti_libtss2_tcti_device_la_CFLAGS = $(AM_CFLAGS) if HAVE_LD_VERSION_SCRIPT -tcti_libtcti_device_la_LDFLAGS = -Wl,--version-script=$(srcdir)/tcti/tcti_device.map +src_tss2_tcti_libtss2_tcti_device_la_LDFLAGS = -Wl,--version-script=$(srcdir)/lib/tss2-tcti-device.map endif # HAVE_LD_VERSION_SCRIPT -tcti_libtcti_device_la_LIBADD = $(libtss2_mu) $(libutil) -tcti_libtcti_device_la_SOURCES = tcti/tcti_device.c +src_tss2_tcti_libtss2_tcti_device_la_LIBADD = $(libtss2_mu) $(libutil) +src_tss2_tcti_libtss2_tcti_device_la_SOURCES = src/tss2-tcti/tcti-device.c # tcti library for microsoft simulator -libtcti_mssim = tcti/libtcti-mssim.la +libtss2_tcti_mssim = src/tss2-tcti/libtss2-tcti-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 +lib_LTLIBRARIES += $(libtss2_tcti_mssim) +nodist_pkgconfig_DATA += lib/tss2-tcti-mssim.pc +EXTRA_DIST += lib/tss2-tcti-mssim.map lib/tss2-tcti-mssim.pc.in -tcti_libtcti_mssim_la_CFLAGS = $(AM_CFLAGS) $(URIPARSER_CFLAGS) +src_tss2_tcti_libtss2_tcti_mssim_la_CFLAGS = $(AM_CFLAGS) $(URIPARSER_CFLAGS) if HAVE_LD_VERSION_SCRIPT -tcti_libtcti_mssim_la_LDFLAGS = -Wl,--version-script=$(srcdir)/lib/tcti-mssim.map +src_tss2_tcti_libtss2_tcti_mssim_la_LDFLAGS = -Wl,--version-script=$(srcdir)/lib/tss2-tcti-mssim.map endif # HAVE_LD_VERSION_SCRIPT -tcti_libtcti_mssim_la_LIBADD = $(libtss2_mu) $(URIPARSER_LIBS) $(libutil) -tcti_libtcti_mssim_la_SOURCES = tcti/tcti-mssim.c tcti/sockets.c tcti/sockets.h +src_tss2_tcti_libtss2_tcti_mssim_la_LIBADD = $(libtss2_mu) $(URIPARSER_LIBS) $(libutil) +src_tss2_tcti_libtss2_tcti_mssim_la_SOURCES = src/tss2-tcti/tcti-mssim.c \ + src/tss2-tcti/sockets.c src/tss2-tcti/sockets.h ### TCG TSS SAPI spec library ### libsapi = sysapi/libsapi.la @@ -162,7 +163,7 @@ esapi_libesapi_la_CFLAGS = $(AM_CFLAGS) -Wno-unused-variable -Wno-unused-label -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) $(libtss2_mu) $(libtcti_device) $(libtcti_mssim) $(libutil) +esapi_libesapi_la_LIBADD = $(libsapi) $(libtss2_mu) $(libtss2_tcti_device) $(libtss2_tcti_mssim) $(libutil) esapi_libesapi_la_LDFLAGS = $(AM_LDFLAGS) -lgcrypt esapi_libesapi_la_SOURCES = $(ESAPI_SRC) @@ -170,7 +171,7 @@ endif #ESAPI ### Man Pages man3_MANS = man/man3/Tss2_Tcti_Device_Init.3 man/man3/Tss2_Tcti_Mssim_Init.3 -man7_MANS = man/man7/tcti-device.7 man/man7/tcti-mssim.7 +man7_MANS = man/man7/tss2-tcti-device.7 man/man7/tss2-tcti-mssim.7 man/man3/%.3 : man/%.3.in $(srcdir)/man/man-postlude.troff $(AM_V_GEN)$(call make_man,$@,$<,$(srcdir)/man/man-postlude.troff) @@ -182,8 +183,8 @@ EXTRA_DIST += \ man/man-postlude.troff \ man/Tss2_Tcti_Device_Init.3.in \ man/Tss2_Tcti_Mssim_Init.3.in \ - man/tcti-device.7.in \ - man/tcti-mssim.7.in + man/tss2-tcti-device.7.in \ + man/tss2-tcti-mssim.7.in CLEANFILES += \ $(man3_MANS) \ diff --git a/lib/tcti-mssim.pc.in b/lib/tcti-mssim.pc.in deleted file mode 100644 index d4c1371e3..000000000 --- a/lib/tcti-mssim.pc.in +++ /dev/null @@ -1,7 +0,0 @@ -Name: tcti-socket -Description: TCTI library for communicating with a TPM over a socket. -URL: https://github.com/tpm2-software/tpm2-tss -Version: @VERSION@ -Requires: marshal -Cflags: -I@includedir@ -Libs: -ltcti-socket -L@libdir@ diff --git a/tcti/tcti_device.map b/lib/tss2-tcti-device.map similarity index 100% rename from tcti/tcti_device.map rename to lib/tss2-tcti-device.map diff --git a/lib/tcti-device.pc.in b/lib/tss2-tcti-device.pc.in similarity index 67% rename from lib/tcti-device.pc.in rename to lib/tss2-tcti-device.pc.in index c210af66b..81b395952 100644 --- a/lib/tcti-device.pc.in +++ b/lib/tss2-tcti-device.pc.in @@ -1,7 +1,7 @@ -Name: tcti-device +Name: tss2-tcti-device Description: TCTI library for communicating with a TPM device node. URL: https://github.com/tpm2-software/tpm2-tss Version: @VERSION@ -Requires: marshal +Requires: tss2-mu Cflags: -I@includedir@ -Libs: -ltcti-device -L@libdir@ +Libs: -ltss2-tcti-device -L@libdir@ diff --git a/lib/tcti-mssim.map b/lib/tss2-tcti-mssim.map similarity index 100% rename from lib/tcti-mssim.map rename to lib/tss2-tcti-mssim.map diff --git a/lib/tss2-tcti-mssim.pc.in b/lib/tss2-tcti-mssim.pc.in new file mode 100644 index 000000000..121c7a4ef --- /dev/null +++ b/lib/tss2-tcti-mssim.pc.in @@ -0,0 +1,7 @@ +Name: tss2-tcti-mssim +Description: TCTI library for communicating with the Microsoft TPM2 simulator. +URL: https://github.com/tpm2-software/tpm2-tss +Version: @VERSION@ +Requires: tss2-mu +Cflags: -I@includedir@ +Libs: -ltss2-tcti-mssim -L@libdir@ diff --git a/man/tcti-device.7.in b/man/tss2-tcti-device.7.in similarity index 100% rename from man/tcti-device.7.in rename to man/tss2-tcti-device.7.in diff --git a/man/tcti-mssim.7.in b/man/tss2-tcti-mssim.7.in similarity index 100% rename from man/tcti-mssim.7.in rename to man/tss2-tcti-mssim.7.in diff --git a/tcti/sockets.c b/src/tss2-tcti/sockets.c similarity index 100% rename from tcti/sockets.c rename to src/tss2-tcti/sockets.c diff --git a/tcti/sockets.h b/src/tss2-tcti/sockets.h similarity index 100% rename from tcti/sockets.h rename to src/tss2-tcti/sockets.h diff --git a/tcti/tcti_device.c b/src/tss2-tcti/tcti-device.c similarity index 100% rename from tcti/tcti_device.c rename to src/tss2-tcti/tcti-device.c diff --git a/tcti/tcti-mssim.c b/src/tss2-tcti/tcti-mssim.c similarity index 100% rename from tcti/tcti-mssim.c rename to src/tss2-tcti/tcti-mssim.c diff --git a/tcti/tcti.c b/src/tss2-tcti/tcti.c similarity index 100% rename from tcti/tcti.c rename to src/tss2-tcti/tcti.c diff --git a/tcti/tcti.h b/src/tss2-tcti/tcti.h similarity index 100% rename from tcti/tcti.h rename to src/tss2-tcti/tcti.h diff --git a/test/integration/main-esapi.c b/test/integration/main-esapi.c index f5ff9332d..e48163acd 100644 --- a/test/integration/main-esapi.c +++ b/test/integration/main-esapi.c @@ -9,7 +9,7 @@ #include "esys_types.h" #include "esys_iutil.h" #include "tss2_tcti.h" -#include "tcti/tcti.h" +#include "tss2-tcti/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/sys-initialize.int.c b/test/integration/sys-initialize.int.c index 262564298..425022d6c 100644 --- a/test/integration/sys-initialize.int.c +++ b/test/integration/sys-initialize.int.c @@ -3,7 +3,7 @@ #include "log/log.h" #include "test.h" #include "tpm20.h" -#include "tcti/tcti.h" +#include "tss2-tcti/tcti.h" #include "sysapi/include/sysapi_util.h" /** diff --git a/test/unit/socket.c b/test/unit/socket.c index 53d1cd3d1..3a8f82d60 100644 --- a/test/unit/socket.c +++ b/test/unit/socket.c @@ -32,7 +32,7 @@ #include #include "tpm20.h" -#include "tcti/sockets.h" +#include "tss2-tcti/sockets.h" int __wrap_socket ( diff --git a/test/unit/tcti-device.c b/test/unit/tcti-device.c index 14c950947..93a90b70a 100644 --- a/test/unit/tcti-device.c +++ b/test/unit/tcti-device.c @@ -7,7 +7,7 @@ #include "tss2_mu.h" #include "tss2_tcti_device.h" -#include "tcti/tcti.h" +#include "tss2-tcti/tcti.h" /** * When passed all NULL values ensure that we get back the expected RC diff --git a/test/unit/tcti-mssim.c b/test/unit/tcti-mssim.c index a6fdcab41..1d99b579d 100644 --- a/test/unit/tcti-mssim.c +++ b/test/unit/tcti-mssim.c @@ -35,7 +35,7 @@ #include "tpm20.h" #include "tss2_tcti_mssim.h" -#include "tcti/tcti.h" +#include "tss2-tcti/tcti.h" /* * This function is implemented in the socket TCTI module but not exposed diff --git a/test/unit/util.c b/test/unit/util.c index 0b985d683..5ee8ec8b5 100644 --- a/test/unit/util.c +++ b/test/unit/util.c @@ -5,7 +5,7 @@ #include #include -#include "tcti/tcti.h" +#include "tss2-tcti/tcti.h" #define LOGMODULE unit_util #include "log/log.h"