From b448e3ece6f234c7803acd348160327736552c3b Mon Sep 17 00:00:00 2001 From: Andreas Steffen Date: Fri, 25 Nov 2011 00:18:58 +0100 Subject: [PATCH] moved attestation plugins to libpts in order to resolve circular reference with libimcv --- configure.in | 4 ++-- src/Makefile.am | 8 ++++---- src/checksum/Makefile.am | 2 +- src/libimcv/Makefile.am | 8 -------- src/libpts/Makefile.am | 9 +++++++++ .../plugins/imc_attestation/Makefile.am | 0 .../plugins/imc_attestation/imc_attestation.c | 0 .../plugins/imc_attestation/imc_attestation_process.c | 0 .../plugins/imc_attestation/imc_attestation_process.h | 0 .../plugins/imc_attestation/imc_attestation_state.c | 0 .../plugins/imc_attestation/imc_attestation_state.h | 0 .../plugins/imv_attestation/.gitignore | 0 .../plugins/imv_attestation/Makefile.am | 0 src/{libimcv => libpts}/plugins/imv_attestation/attest.c | 0 .../plugins/imv_attestation/attest_db.c | 0 .../plugins/imv_attestation/attest_db.h | 0 .../plugins/imv_attestation/attest_usage.c | 0 .../plugins/imv_attestation/attest_usage.h | 0 src/{libimcv => libpts}/plugins/imv_attestation/data.sql | 0 .../plugins/imv_attestation/imv_attestation.c | 0 .../plugins/imv_attestation/imv_attestation_build.c | 0 .../plugins/imv_attestation/imv_attestation_build.h | 0 .../plugins/imv_attestation/imv_attestation_process.c | 0 .../plugins/imv_attestation/imv_attestation_process.h | 0 .../plugins/imv_attestation/imv_attestation_state.c | 0 .../plugins/imv_attestation/imv_attestation_state.h | 0 .../plugins/imv_attestation/tables.sql | 0 27 files changed, 16 insertions(+), 15 deletions(-) rename src/{libimcv => libpts}/plugins/imc_attestation/Makefile.am (100%) rename src/{libimcv => libpts}/plugins/imc_attestation/imc_attestation.c (100%) rename src/{libimcv => libpts}/plugins/imc_attestation/imc_attestation_process.c (100%) rename src/{libimcv => libpts}/plugins/imc_attestation/imc_attestation_process.h (100%) rename src/{libimcv => libpts}/plugins/imc_attestation/imc_attestation_state.c (100%) rename src/{libimcv => libpts}/plugins/imc_attestation/imc_attestation_state.h (100%) rename src/{libimcv => libpts}/plugins/imv_attestation/.gitignore (100%) rename src/{libimcv => libpts}/plugins/imv_attestation/Makefile.am (100%) rename src/{libimcv => libpts}/plugins/imv_attestation/attest.c (100%) rename src/{libimcv => libpts}/plugins/imv_attestation/attest_db.c (100%) rename src/{libimcv => libpts}/plugins/imv_attestation/attest_db.h (100%) rename src/{libimcv => libpts}/plugins/imv_attestation/attest_usage.c (100%) rename src/{libimcv => libpts}/plugins/imv_attestation/attest_usage.h (100%) rename src/{libimcv => libpts}/plugins/imv_attestation/data.sql (100%) rename src/{libimcv => libpts}/plugins/imv_attestation/imv_attestation.c (100%) rename src/{libimcv => libpts}/plugins/imv_attestation/imv_attestation_build.c (100%) rename src/{libimcv => libpts}/plugins/imv_attestation/imv_attestation_build.h (100%) rename src/{libimcv => libpts}/plugins/imv_attestation/imv_attestation_process.c (100%) rename src/{libimcv => libpts}/plugins/imv_attestation/imv_attestation_process.h (100%) rename src/{libimcv => libpts}/plugins/imv_attestation/imv_attestation_state.c (100%) rename src/{libimcv => libpts}/plugins/imv_attestation/imv_attestation_state.h (100%) rename src/{libimcv => libpts}/plugins/imv_attestation/tables.sql (100%) diff --git a/configure.in b/configure.in index 72d79a02af..17bee41439 100644 --- 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 5e85a5f88e..041bd480fe 100644 --- 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 ea7ecae037..a55891a298 100644 --- 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 1b240a1d9a..fae9fd662a 100644 --- 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 4ceb437480..abe3cda0b9 100644 --- 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 -- 2.47.2