moved attestation plugins to libpts in order to resolve circular reference with libimcv

diff --git a/configure.in b/configure.in
index 72d79a02affdf71bacbf38ff1c561c09c46f1c75..17bee414397fa73e296299464607c028ea7f2790 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1108,13 +1108,13 @@ AC_OUTPUT(
        src/libtncif/Makefile
        src/libtnccs/Makefile
        src/libpts/Makefile
+       src/libpts/plugins/imc_attestation/Makefile
+       src/libpts/plugins/imv_attestation/Makefile
        src/libimcv/Makefile
        src/libimcv/plugins/imc_test/Makefile
        src/libimcv/plugins/imv_test/Makefile
        src/libimcv/plugins/imc_scanner/Makefile
        src/libimcv/plugins/imv_scanner/Makefile
-       src/libimcv/plugins/imc_attestation/Makefile
-       src/libimcv/plugins/imv_attestation/Makefile
        src/pluto/Makefile
        src/pluto/plugins/xauth/Makefile
        src/whack/Makefile

diff --git a/src/Makefile.am b/src/Makefile.am
index 5e85a5f88e94fc0f4bfd100c8eb657d127b67997..041bd480febc1fe2392f2ce97a53ccf96a6d6a12 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,14 +24,14 @@ if USE_LIBTNCCS
   SUBDIRS += libtnccs
 endif
 
-if USE_PTS
-  SUBDIRS += libpts
-endif
-
 if USE_IMCV
   SUBDIRS += libimcv
 endif
 
+if USE_PTS
+  SUBDIRS += libpts
+endif
+
 if USE_LIBCHARON
   SUBDIRS += libcharon
 endif

diff --git a/src/checksum/Makefile.am b/src/checksum/Makefile.am
index ea7ecae0376e52c6a7948caebb364062a370db2c..a55891a2982b32b3e873858cdd711e33073e5ce6 100644 (file)
--- a/src/checksum/Makefile.am
+++ b/src/checksum/Makefile.am
@@ -90,7 +90,7 @@ if USE_ATTR_SQL
 endif
 
 if USE_IMV_ATTESTATION
-  exes += $(top_builddir)/src/libimcv/plugins/imv_attestation/.libs/attest
+  exes += $(top_builddir)/src/libpts/plugins/imv_attestation/.libs/attest
 endif
 
 checksum.c : checksum_builder $(deps) $(exes)

diff --git a/src/libimcv/Makefile.am b/src/libimcv/Makefile.am
index 1b240a1d9a578a088e35a540cd7ca34c35cb869e..fae9fd662ac6bbc64847292d10cbf503a8ffcf3d 100644 (file)
--- a/src/libimcv/Makefile.am
+++ b/src/libimcv/Makefile.am
@@ -36,11 +36,3 @@ endif
 if USE_IMV_SCANNER
   SUBDIRS += plugins/imv_scanner
 endif 
-
-if USE_IMC_ATTESTATION
-  SUBDIRS += plugins/imc_attestation
-endif
-
-if USE_IMV_ATTESTATION
-  SUBDIRS += plugins/imv_attestation
-endif

diff --git a/src/libpts/Makefile.am b/src/libpts/Makefile.am
index 4ceb43748041ca541f9851bca2706e5840ac35a7..abe3cda0b91ed3fa81f2482dc098462535b6b68a 100644 (file)
--- a/src/libpts/Makefile.am
+++ b/src/libpts/Makefile.am
@@ -46,3 +46,12 @@ libpts_la_SOURCES = \
        tcg/tcg_pts_attr_req_file_meta.h tcg/tcg_pts_attr_req_file_meta.c \
        tcg/tcg_pts_attr_unix_file_meta.h tcg/tcg_pts_attr_unix_file_meta.c
        
+SUBDIRS = .
+
+if USE_IMC_ATTESTATION
+  SUBDIRS += plugins/imc_attestation
+endif
+
+if USE_IMV_ATTESTATION
+  SUBDIRS += plugins/imv_attestation
+endif

diff --git a/src/libimcv/plugins/imc_attestation/Makefile.am b/src/libpts/plugins/imc_attestation/Makefile.am
similarity index 100%
rename from src/libimcv/plugins/imc_attestation/Makefile.am
rename to src/libpts/plugins/imc_attestation/Makefile.am

diff --git a/src/libimcv/plugins/imc_attestation/imc_attestation.c b/src/libpts/plugins/imc_attestation/imc_attestation.c
similarity index 100%
rename from src/libimcv/plugins/imc_attestation/imc_attestation.c
rename to src/libpts/plugins/imc_attestation/imc_attestation.c

diff --git a/src/libimcv/plugins/imc_attestation/imc_attestation_process.c b/src/libpts/plugins/imc_attestation/imc_attestation_process.c
similarity index 100%
rename from src/libimcv/plugins/imc_attestation/imc_attestation_process.c
rename to src/libpts/plugins/imc_attestation/imc_attestation_process.c

diff --git a/src/libimcv/plugins/imc_attestation/imc_attestation_process.h b/src/libpts/plugins/imc_attestation/imc_attestation_process.h
similarity index 100%
rename from src/libimcv/plugins/imc_attestation/imc_attestation_process.h
rename to src/libpts/plugins/imc_attestation/imc_attestation_process.h

diff --git a/src/libimcv/plugins/imc_attestation/imc_attestation_state.c b/src/libpts/plugins/imc_attestation/imc_attestation_state.c
similarity index 100%
rename from src/libimcv/plugins/imc_attestation/imc_attestation_state.c
rename to src/libpts/plugins/imc_attestation/imc_attestation_state.c

diff --git a/src/libimcv/plugins/imc_attestation/imc_attestation_state.h b/src/libpts/plugins/imc_attestation/imc_attestation_state.h
similarity index 100%
rename from src/libimcv/plugins/imc_attestation/imc_attestation_state.h
rename to src/libpts/plugins/imc_attestation/imc_attestation_state.h

diff --git a/src/libimcv/plugins/imv_attestation/.gitignore b/src/libpts/plugins/imv_attestation/.gitignore
similarity index 100%
rename from src/libimcv/plugins/imv_attestation/.gitignore
rename to src/libpts/plugins/imv_attestation/.gitignore

diff --git a/src/libimcv/plugins/imv_attestation/Makefile.am b/src/libpts/plugins/imv_attestation/Makefile.am
similarity index 100%
rename from src/libimcv/plugins/imv_attestation/Makefile.am
rename to src/libpts/plugins/imv_attestation/Makefile.am

diff --git a/src/libimcv/plugins/imv_attestation/attest.c b/src/libpts/plugins/imv_attestation/attest.c
similarity index 100%
rename from src/libimcv/plugins/imv_attestation/attest.c
rename to src/libpts/plugins/imv_attestation/attest.c

diff --git a/src/libimcv/plugins/imv_attestation/attest_db.c b/src/libpts/plugins/imv_attestation/attest_db.c
similarity index 100%
rename from src/libimcv/plugins/imv_attestation/attest_db.c
rename to src/libpts/plugins/imv_attestation/attest_db.c

diff --git a/src/libimcv/plugins/imv_attestation/attest_db.h b/src/libpts/plugins/imv_attestation/attest_db.h
similarity index 100%
rename from src/libimcv/plugins/imv_attestation/attest_db.h
rename to src/libpts/plugins/imv_attestation/attest_db.h

diff --git a/src/libimcv/plugins/imv_attestation/attest_usage.c b/src/libpts/plugins/imv_attestation/attest_usage.c
similarity index 100%
rename from src/libimcv/plugins/imv_attestation/attest_usage.c
rename to src/libpts/plugins/imv_attestation/attest_usage.c

diff --git a/src/libimcv/plugins/imv_attestation/attest_usage.h b/src/libpts/plugins/imv_attestation/attest_usage.h
similarity index 100%
rename from src/libimcv/plugins/imv_attestation/attest_usage.h
rename to src/libpts/plugins/imv_attestation/attest_usage.h

diff --git a/src/libimcv/plugins/imv_attestation/data.sql b/src/libpts/plugins/imv_attestation/data.sql
similarity index 100%
rename from src/libimcv/plugins/imv_attestation/data.sql
rename to src/libpts/plugins/imv_attestation/data.sql

diff --git a/src/libimcv/plugins/imv_attestation/imv_attestation.c b/src/libpts/plugins/imv_attestation/imv_attestation.c
similarity index 100%
rename from src/libimcv/plugins/imv_attestation/imv_attestation.c
rename to src/libpts/plugins/imv_attestation/imv_attestation.c

diff --git a/src/libimcv/plugins/imv_attestation/imv_attestation_build.c b/src/libpts/plugins/imv_attestation/imv_attestation_build.c
similarity index 100%
rename from src/libimcv/plugins/imv_attestation/imv_attestation_build.c
rename to src/libpts/plugins/imv_attestation/imv_attestation_build.c

diff --git a/src/libimcv/plugins/imv_attestation/imv_attestation_build.h b/src/libpts/plugins/imv_attestation/imv_attestation_build.h
similarity index 100%
rename from src/libimcv/plugins/imv_attestation/imv_attestation_build.h
rename to src/libpts/plugins/imv_attestation/imv_attestation_build.h

diff --git a/src/libimcv/plugins/imv_attestation/imv_attestation_process.c b/src/libpts/plugins/imv_attestation/imv_attestation_process.c
similarity index 100%
rename from src/libimcv/plugins/imv_attestation/imv_attestation_process.c
rename to src/libpts/plugins/imv_attestation/imv_attestation_process.c

diff --git a/src/libimcv/plugins/imv_attestation/imv_attestation_process.h b/src/libpts/plugins/imv_attestation/imv_attestation_process.h
similarity index 100%
rename from src/libimcv/plugins/imv_attestation/imv_attestation_process.h
rename to src/libpts/plugins/imv_attestation/imv_attestation_process.h

diff --git a/src/libimcv/plugins/imv_attestation/imv_attestation_state.c b/src/libpts/plugins/imv_attestation/imv_attestation_state.c
similarity index 100%
rename from src/libimcv/plugins/imv_attestation/imv_attestation_state.c
rename to src/libpts/plugins/imv_attestation/imv_attestation_state.c

diff --git a/src/libimcv/plugins/imv_attestation/imv_attestation_state.h b/src/libpts/plugins/imv_attestation/imv_attestation_state.h
similarity index 100%
rename from src/libimcv/plugins/imv_attestation/imv_attestation_state.h
rename to src/libpts/plugins/imv_attestation/imv_attestation_state.h

diff --git a/src/libimcv/plugins/imv_attestation/tables.sql b/src/libpts/plugins/imv_attestation/tables.sql
similarity index 100%
rename from src/libimcv/plugins/imv_attestation/tables.sql
rename to src/libpts/plugins/imv_attestation/tables.sql