diff options
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/libimcv/Makefile.am | 31 | ||||
| -rw-r--r-- | src/libimcv/pa_tnc/pa_tnc_attr.c | 6 | ||||
| -rw-r--r-- | src/libimcv/pa_tnc/pa_tnc_msg.c | 7 | ||||
| -rw-r--r-- | src/libimcv/plugins/imc_attestation/Makefile.am | 5 | ||||
| -rw-r--r-- | src/libimcv/plugins/imc_attestation/imc_attestation.c | 2 | ||||
| -rw-r--r-- | src/libimcv/plugins/imc_attestation/imc_attestation_state.h | 2 | ||||
| -rw-r--r-- | src/libimcv/plugins/imv_attestation/Makefile.am | 5 | ||||
| -rw-r--r-- | src/libimcv/plugins/imv_attestation/imv_attestation.c | 6 | ||||
| -rw-r--r-- | src/libimcv/plugins/imv_attestation/imv_attestation_state.h | 2 | ||||
| -rw-r--r-- | src/libpts/Makefile.am | 28 | ||||
| -rw-r--r-- | src/libpts/pts/pts.c (renamed from src/libimcv/tcg/pts/pts.c) | 0 | ||||
| -rw-r--r-- | src/libpts/pts/pts.h (renamed from src/libimcv/tcg/pts/pts.h) | 0 | ||||
| -rw-r--r-- | src/libpts/pts/pts_creds.c (renamed from src/libimcv/tcg/pts/pts_creds.c) | 0 | ||||
| -rw-r--r-- | src/libpts/pts/pts_creds.h (renamed from src/libimcv/tcg/pts/pts_creds.h) | 0 | ||||
| -rw-r--r-- | src/libpts/pts/pts_database.c (renamed from src/libimcv/tcg/pts/pts_database.c) | 0 | ||||
| -rw-r--r-- | src/libpts/pts/pts_database.h (renamed from src/libimcv/tcg/pts/pts_database.h) | 0 | ||||
| -rw-r--r-- | src/libpts/pts/pts_error.c (renamed from src/libimcv/tcg/pts/pts_error.c) | 0 | ||||
| -rw-r--r-- | src/libpts/pts/pts_error.h (renamed from src/libimcv/tcg/pts/pts_error.h) | 0 | ||||
| -rw-r--r-- | src/libpts/pts/pts_file_meas.c (renamed from src/libimcv/tcg/pts/pts_file_meas.c) | 0 | ||||
| -rw-r--r-- | src/libpts/pts/pts_file_meas.h (renamed from src/libimcv/tcg/pts/pts_file_meas.h) | 0 | ||||
| -rw-r--r-- | src/libpts/pts/pts_funct_comp_name.h (renamed from src/libimcv/tcg/pts/pts_funct_comp_name.h) | 0 | ||||
| -rw-r--r-- | src/libpts/pts/pts_meas_algo.c (renamed from src/libimcv/tcg/pts/pts_meas_algo.c) | 0 | ||||
| -rw-r--r-- | src/libpts/pts/pts_meas_algo.h (renamed from src/libimcv/tcg/pts/pts_meas_algo.h) | 0 | ||||
| -rw-r--r-- | src/libpts/pts/pts_proto_caps.h (renamed from src/libimcv/tcg/pts/pts_proto_caps.h) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_attr.c (renamed from src/libimcv/tcg/tcg_attr.c) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_attr.h (renamed from src/libimcv/tcg/tcg_attr.h) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_aik.c (renamed from src/libimcv/tcg/tcg_pts_attr_aik.c) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_aik.h (renamed from src/libimcv/tcg/tcg_pts_attr_aik.h) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_file_meas.c (renamed from src/libimcv/tcg/tcg_pts_attr_file_meas.c) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_file_meas.h (renamed from src/libimcv/tcg/tcg_pts_attr_file_meas.h) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_gen_attest_evid.c (renamed from src/libimcv/tcg/tcg_pts_attr_gen_attest_evid.c) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_gen_attest_evid.h (renamed from src/libimcv/tcg/tcg_pts_attr_gen_attest_evid.h) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_get_aik.c (renamed from src/libimcv/tcg/tcg_pts_attr_get_aik.c) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_get_aik.h (renamed from src/libimcv/tcg/tcg_pts_attr_get_aik.h) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_get_tpm_version_info.c (renamed from src/libimcv/tcg/tcg_pts_attr_get_tpm_version_info.c) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_get_tpm_version_info.h (renamed from src/libimcv/tcg/tcg_pts_attr_get_tpm_version_info.h) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_meas_algo.c (renamed from src/libimcv/tcg/tcg_pts_attr_meas_algo.c) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_meas_algo.h (renamed from src/libimcv/tcg/tcg_pts_attr_meas_algo.h) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_proto_caps.c (renamed from src/libimcv/tcg/tcg_pts_attr_proto_caps.c) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_proto_caps.h (renamed from src/libimcv/tcg/tcg_pts_attr_proto_caps.h) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_req_file_meas.c (renamed from src/libimcv/tcg/tcg_pts_attr_req_file_meas.c) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_req_file_meas.h (renamed from src/libimcv/tcg/tcg_pts_attr_req_file_meas.h) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_req_funct_comp_evid.c (renamed from src/libimcv/tcg/tcg_pts_attr_req_funct_comp_evid.c) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_req_funct_comp_evid.h (renamed from src/libimcv/tcg/tcg_pts_attr_req_funct_comp_evid.h) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_simple_comp_evid.c (renamed from src/libimcv/tcg/tcg_pts_attr_simple_comp_evid.c) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_simple_comp_evid.h (renamed from src/libimcv/tcg/tcg_pts_attr_simple_comp_evid.h) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_simple_evid_final.c (renamed from src/libimcv/tcg/tcg_pts_attr_simple_evid_final.c) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_simple_evid_final.h (renamed from src/libimcv/tcg/tcg_pts_attr_simple_evid_final.h) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_tpm_version_info.c (renamed from src/libimcv/tcg/tcg_pts_attr_tpm_version_info.c) | 0 | ||||
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_tpm_version_info.h (renamed from src/libimcv/tcg/tcg_pts_attr_tpm_version_info.h) | 0 |
52 files changed, 69 insertions, 35 deletions
diff --git a/configure.in b/configure.in index 67e777ddc..3302a91ca 100644 --- a/configure.in +++ b/configure.in @@ -254,6 +254,10 @@ if test x$imc_test = xtrue -o x$imv_test = xtrue -o x$imc_scanner = xtrue -o x$i imcv=true; fi +if test x$imc_attestation = xtrue -o x$imv_attestation = xtrue; then + pts=true; +fi + if test x$fips_prf = xtrue; then if test x$openssl = xfalse; then sha1=true; @@ -1003,6 +1007,7 @@ AM_CONDITIONAL(USE_VSTR, test x$vstr = xtrue) AM_CONDITIONAL(USE_SIMAKA, test x$simaka = xtrue) AM_CONDITIONAL(USE_TLS, test x$tls = xtrue) AM_CONDITIONAL(USE_IMCV, test x$imcv = xtrue) +AM_CONDITIONAL(USE_PTS, test x$pts = xtrue) AM_CONDITIONAL(MONOLITHIC, test x$monolithic = xtrue) dnl ============================== @@ -1079,6 +1084,7 @@ AC_OUTPUT( src/libsimaka/Makefile src/libtls/Makefile src/libtncif/Makefile + src/libpts/Makefile src/libimcv/Makefile src/libimcv/plugins/imc_test/Makefile src/libimcv/plugins/imv_test/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 3d56faaf0..33e1b1264 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,6 +20,10 @@ if USE_LIBTNCIF SUBDIRS += libtncif endif +if USE_PTS + SUBDIRS += libpts +endif + if USE_IMCV SUBDIRS += libimcv endif diff --git a/src/libimcv/Makefile.am b/src/libimcv/Makefile.am index 3e040d7a3..1bbfd29f6 100644 --- a/src/libimcv/Makefile.am +++ b/src/libimcv/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libtncif ipseclib_LTLIBRARIES = libimcv.la -libimcv_la_LIBADD = $(top_builddir)/src/libtncif/libtncif.la -ltspi -lcurl +libimcv_la_LIBADD = $(top_builddir)/src/libtncif/libtncif.la libimcv_la_SOURCES = \ imcv.h imcv.c \ @@ -16,32 +16,15 @@ libimcv_la_SOURCES = \ ita/ita_attr.h ita/ita_attr.c \ ita/ita_attr_command.h ita/ita_attr_command.c \ pa_tnc/pa_tnc_msg.h pa_tnc/pa_tnc_msg.c \ - pa_tnc/pa_tnc_attr.h pa_tnc/pa_tnc_attr.c \ - tcg/tcg_attr.h tcg/tcg_attr.c \ - tcg/tcg_pts_attr_proto_caps.h tcg/tcg_pts_attr_proto_caps.c \ - tcg/tcg_pts_attr_meas_algo.h tcg/tcg_pts_attr_meas_algo.c \ - tcg/tcg_pts_attr_get_tpm_version_info.h tcg/tcg_pts_attr_get_tpm_version_info.c \ - tcg/tcg_pts_attr_tpm_version_info.h tcg/tcg_pts_attr_tpm_version_info.c \ - tcg/tcg_pts_attr_get_aik.h tcg/tcg_pts_attr_get_aik.c \ - tcg/tcg_pts_attr_aik.h tcg/tcg_pts_attr_aik.c \ - tcg/tcg_pts_attr_req_funct_comp_evid.h tcg/tcg_pts_attr_req_funct_comp_evid.c \ - tcg/tcg_pts_attr_gen_attest_evid.h tcg/tcg_pts_attr_gen_attest_evid.c \ - tcg/tcg_pts_attr_simple_comp_evid.h tcg/tcg_pts_attr_simple_comp_evid.c \ - tcg/tcg_pts_attr_simple_evid_final.h tcg/tcg_pts_attr_simple_evid_final.c \ - tcg/tcg_pts_attr_req_file_meas.h tcg/tcg_pts_attr_req_file_meas.c \ - tcg/tcg_pts_attr_file_meas.h tcg/tcg_pts_attr_file_meas.c \ - tcg/pts/pts.h tcg/pts/pts.c \ - tcg/pts/pts_error.h tcg/pts/pts_error.c \ - tcg/pts/pts_proto_caps.h tcg/pts/pts_funct_comp_name.h \ - tcg/pts/pts_creds.h tcg/pts/pts_creds.c \ - tcg/pts/pts_database.h tcg/pts/pts_database.c \ - tcg/pts/pts_file_meas.h tcg/pts/pts_file_meas.c \ - tcg/pts/pts_meas_algo.h tcg/pts/pts_meas_algo.c - -# CFLAGS = -Wall -Werror + pa_tnc/pa_tnc_attr.h pa_tnc/pa_tnc_attr.c SUBDIRS = . +if USE_PTS + INCLUDES += -I$(top_srcdir)/src/libpts + AM_CFLAGS = -DUSE_PTS +endif + if USE_IMC_TEST SUBDIRS += plugins/imc_test endif diff --git a/src/libimcv/pa_tnc/pa_tnc_attr.c b/src/libimcv/pa_tnc/pa_tnc_attr.c index 9efbfba47..c927e23e0 100644 --- a/src/libimcv/pa_tnc/pa_tnc_attr.c +++ b/src/libimcv/pa_tnc/pa_tnc_attr.c @@ -18,6 +18,8 @@ #include "ietf/ietf_attr_pa_tnc_error.h" #include "ietf/ietf_attr_port_filter.h" #include "ietf/ietf_attr_product_info.h" + +#ifdef USE_PTS #include "tcg/tcg_attr.h" #include "tcg/tcg_pts_attr_proto_caps.h" #include "tcg/tcg_pts_attr_meas_algo.h" @@ -31,6 +33,8 @@ #include "tcg/tcg_pts_attr_simple_evid_final.h" #include "tcg/tcg_pts_attr_req_file_meas.h" #include "tcg/tcg_pts_attr_file_meas.h" +#endif /* USE_PTS */ + #include "ita/ita_attr.h" #include "ita/ita_attr_command.h" @@ -66,6 +70,7 @@ pa_tnc_attr_t* pa_tnc_attr_create_from_data(pen_t vendor_id, u_int32_t type, break; } break; +#ifdef USE_PTS case PEN_TCG: switch (type) { @@ -116,6 +121,7 @@ pa_tnc_attr_t* pa_tnc_attr_create_from_data(pen_t vendor_id, u_int32_t type, break; } break; +#endif /* HAVE _PTS */ case PEN_ITA: switch (type) { diff --git a/src/libimcv/pa_tnc/pa_tnc_msg.c b/src/libimcv/pa_tnc/pa_tnc_msg.c index 3b84f3da8..2b29d7403 100644 --- a/src/libimcv/pa_tnc/pa_tnc_msg.c +++ b/src/libimcv/pa_tnc/pa_tnc_msg.c @@ -17,9 +17,12 @@ #include "pa_tnc_msg.h" #include "ietf/ietf_attr.h" #include "ietf/ietf_attr_pa_tnc_error.h" -#include "tcg/tcg_attr.h" #include "ita/ita_attr.h" +#ifdef USE_PTS +#include "tcg/tcg_attr.h" +#endif /* USE_PTS */ + #include <bio/bio_writer.h> #include <bio/bio_reader.h> #include <utils/linked_list.h> @@ -375,8 +378,10 @@ enum_name_t* get_pa_attr_names(pen_t pen) { case PEN_IETF: return ietf_attr_names; +#ifdef USE_PTS case PEN_TCG: return tcg_attr_names; +#endif /* USE_PTS */ case PEN_ITA: return ita_attr_names; default: diff --git a/src/libimcv/plugins/imc_attestation/Makefile.am b/src/libimcv/plugins/imc_attestation/Makefile.am index 5981ac2ca..ee082319d 100644 --- a/src/libimcv/plugins/imc_attestation/Makefile.am +++ b/src/libimcv/plugins/imc_attestation/Makefile.am @@ -1,13 +1,14 @@ INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libtncif \ - -I$(top_srcdir)/src/libimcv + -I$(top_srcdir)/src/libimcv -I$(top_srcdir)/src/libpts AM_CFLAGS = -rdynamic imcv_LTLIBRARIES = imc-attestation.la imc_attestation_la_LIBADD = $(top_builddir)/src/libimcv/libimcv.la \ - $(top_builddir)/src/libstrongswan/libstrongswan.la + $(top_builddir)/src/libstrongswan/libstrongswan.la \ + $(top_builddir)/src/libpts/libpts.la imc_attestation_la_SOURCES = imc_attestation.c \ imc_attestation_state.h imc_attestation_state.c diff --git a/src/libimcv/plugins/imc_attestation/imc_attestation.c b/src/libimcv/plugins/imc_attestation/imc_attestation.c index 9b60bc07c..e595146aa 100644 --- a/src/libimcv/plugins/imc_attestation/imc_attestation.c +++ b/src/libimcv/plugins/imc_attestation/imc_attestation.c @@ -21,7 +21,7 @@ #include <ietf/ietf_attr_pa_tnc_error.h> #include <ietf/ietf_attr_product_info.h> -#include <tcg/pts/pts_error.h> +#include <pts/pts_error.h> #include <tcg/tcg_pts_attr_proto_caps.h> #include <tcg/tcg_pts_attr_meas_algo.h> diff --git a/src/libimcv/plugins/imc_attestation/imc_attestation_state.h b/src/libimcv/plugins/imc_attestation/imc_attestation_state.h index 8672c828f..d083f3b57 100644 --- a/src/libimcv/plugins/imc_attestation/imc_attestation_state.h +++ b/src/libimcv/plugins/imc_attestation/imc_attestation_state.h @@ -23,7 +23,7 @@ #define IMC_ATTESTATION_STATE_H_ #include <imc/imc_state.h> -#include <tcg/pts/pts.h> +#include <pts/pts.h> #include <library.h> typedef struct imc_attestation_state_t imc_attestation_state_t; diff --git a/src/libimcv/plugins/imv_attestation/Makefile.am b/src/libimcv/plugins/imv_attestation/Makefile.am index 2423c522e..bfff6e877 100644 --- a/src/libimcv/plugins/imv_attestation/Makefile.am +++ b/src/libimcv/plugins/imv_attestation/Makefile.am @@ -1,13 +1,14 @@ INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libtncif \ - -I$(top_srcdir)/src/libimcv + -I$(top_srcdir)/src/libimcv -I$(top_srcdir)/src/libpts AM_CFLAGS = -rdynamic imcv_LTLIBRARIES = imv-attestation.la imv_attestation_la_LIBADD = $(top_builddir)/src/libimcv/libimcv.la \ - $(top_builddir)/src/libstrongswan/libstrongswan.la + $(top_builddir)/src/libstrongswan/libstrongswan.la \ + $(top_builddir)/src/libpts/libpts.la imv_attestation_la_SOURCES = imv_attestation.c \ imv_attestation_state.h imv_attestation_state.c diff --git a/src/libimcv/plugins/imv_attestation/imv_attestation.c b/src/libimcv/plugins/imv_attestation/imv_attestation.c index 2bde30858..2aa9aa4f4 100644 --- a/src/libimcv/plugins/imv_attestation/imv_attestation.c +++ b/src/libimcv/plugins/imv_attestation/imv_attestation.c @@ -21,9 +21,9 @@ #include <ietf/ietf_attr_pa_tnc_error.h> #include <ietf/ietf_attr_product_info.h> -#include <tcg/pts/pts_database.h> -#include <tcg/pts/pts_creds.h> -#include <tcg/pts/pts_error.h> +#include <pts/pts_database.h> +#include <pts/pts_creds.h> +#include <pts/pts_error.h> #include <tcg/tcg_attr.h> #include <tcg/tcg_pts_attr_proto_caps.h> diff --git a/src/libimcv/plugins/imv_attestation/imv_attestation_state.h b/src/libimcv/plugins/imv_attestation/imv_attestation_state.h index 44cb68ec0..58f25fa61 100644 --- a/src/libimcv/plugins/imv_attestation/imv_attestation_state.h +++ b/src/libimcv/plugins/imv_attestation/imv_attestation_state.h @@ -23,7 +23,7 @@ #define IMV_ATTESTATION_STATE_H_ #include <imv/imv_state.h> -#include <tcg/pts/pts.h> +#include <pts/pts.h> #include <library.h> typedef struct imv_attestation_state_t imv_attestation_state_t; diff --git a/src/libpts/Makefile.am b/src/libpts/Makefile.am new file mode 100644 index 000000000..e7528f823 --- /dev/null +++ b/src/libpts/Makefile.am @@ -0,0 +1,28 @@ + +INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libimcv + +ipseclib_LTLIBRARIES = libpts.la + +libpts_la_LIBADD = -ltspi + +libpts_la_SOURCES = \ + pts/pts.h pts/pts.c \ + pts/pts_error.h pts/pts_error.c \ + pts/pts_proto_caps.h pts/pts_funct_comp_name.h \ + pts/pts_creds.h pts/pts_creds.c \ + pts/pts_database.h pts/pts_database.c \ + pts/pts_file_meas.h pts/pts_file_meas.c \ + pts/pts_meas_algo.h pts/pts_meas_algo.c \ + tcg/tcg_attr.h tcg/tcg_attr.c \ + tcg/tcg_pts_attr_proto_caps.h tcg/tcg_pts_attr_proto_caps.c \ + tcg/tcg_pts_attr_meas_algo.h tcg/tcg_pts_attr_meas_algo.c \ + tcg/tcg_pts_attr_get_tpm_version_info.h tcg/tcg_pts_attr_get_tpm_version_info.c \ + tcg/tcg_pts_attr_tpm_version_info.h tcg/tcg_pts_attr_tpm_version_info.c \ + tcg/tcg_pts_attr_get_aik.h tcg/tcg_pts_attr_get_aik.c \ + tcg/tcg_pts_attr_aik.h tcg/tcg_pts_attr_aik.c \ + tcg/tcg_pts_attr_req_funct_comp_evid.h tcg/tcg_pts_attr_req_funct_comp_evid.c \ + tcg/tcg_pts_attr_gen_attest_evid.h tcg/tcg_pts_attr_gen_attest_evid.c \ + tcg/tcg_pts_attr_simple_comp_evid.h tcg/tcg_pts_attr_simple_comp_evid.c \ + tcg/tcg_pts_attr_simple_evid_final.h tcg/tcg_pts_attr_simple_evid_final.c \ + tcg/tcg_pts_attr_req_file_meas.h tcg/tcg_pts_attr_req_file_meas.c \ + tcg/tcg_pts_attr_file_meas.h tcg/tcg_pts_attr_file_meas.c diff --git a/src/libimcv/tcg/pts/pts.c b/src/libpts/pts/pts.c index c9df3f35a..c9df3f35a 100644 --- a/src/libimcv/tcg/pts/pts.c +++ b/src/libpts/pts/pts.c diff --git a/src/libimcv/tcg/pts/pts.h b/src/libpts/pts/pts.h index c2de2ac32..c2de2ac32 100644 --- a/src/libimcv/tcg/pts/pts.h +++ b/src/libpts/pts/pts.h diff --git a/src/libimcv/tcg/pts/pts_creds.c b/src/libpts/pts/pts_creds.c index c1641ca7f..c1641ca7f 100644 --- a/src/libimcv/tcg/pts/pts_creds.c +++ b/src/libpts/pts/pts_creds.c diff --git a/src/libimcv/tcg/pts/pts_creds.h b/src/libpts/pts/pts_creds.h index eb9c39537..eb9c39537 100644 --- a/src/libimcv/tcg/pts/pts_creds.h +++ b/src/libpts/pts/pts_creds.h diff --git a/src/libimcv/tcg/pts/pts_database.c b/src/libpts/pts/pts_database.c index d3e4497e3..d3e4497e3 100644 --- a/src/libimcv/tcg/pts/pts_database.c +++ b/src/libpts/pts/pts_database.c diff --git a/src/libimcv/tcg/pts/pts_database.h b/src/libpts/pts/pts_database.h index f2a6854a5..f2a6854a5 100644 --- a/src/libimcv/tcg/pts/pts_database.h +++ b/src/libpts/pts/pts_database.h diff --git a/src/libimcv/tcg/pts/pts_error.c b/src/libpts/pts/pts_error.c index 843a38ac3..843a38ac3 100644 --- a/src/libimcv/tcg/pts/pts_error.c +++ b/src/libpts/pts/pts_error.c diff --git a/src/libimcv/tcg/pts/pts_error.h b/src/libpts/pts/pts_error.h index 6eeab0792..6eeab0792 100644 --- a/src/libimcv/tcg/pts/pts_error.h +++ b/src/libpts/pts/pts_error.h diff --git a/src/libimcv/tcg/pts/pts_file_meas.c b/src/libpts/pts/pts_file_meas.c index a8a08ab31..a8a08ab31 100644 --- a/src/libimcv/tcg/pts/pts_file_meas.c +++ b/src/libpts/pts/pts_file_meas.c diff --git a/src/libimcv/tcg/pts/pts_file_meas.h b/src/libpts/pts/pts_file_meas.h index 3ebb5c2a0..3ebb5c2a0 100644 --- a/src/libimcv/tcg/pts/pts_file_meas.h +++ b/src/libpts/pts/pts_file_meas.h diff --git a/src/libimcv/tcg/pts/pts_funct_comp_name.h b/src/libpts/pts/pts_funct_comp_name.h index 0926a2bc7..0926a2bc7 100644 --- a/src/libimcv/tcg/pts/pts_funct_comp_name.h +++ b/src/libpts/pts/pts_funct_comp_name.h diff --git a/src/libimcv/tcg/pts/pts_meas_algo.c b/src/libpts/pts/pts_meas_algo.c index 75b1bfa95..75b1bfa95 100644 --- a/src/libimcv/tcg/pts/pts_meas_algo.c +++ b/src/libpts/pts/pts_meas_algo.c diff --git a/src/libimcv/tcg/pts/pts_meas_algo.h b/src/libpts/pts/pts_meas_algo.h index 6aa0ce695..6aa0ce695 100644 --- a/src/libimcv/tcg/pts/pts_meas_algo.h +++ b/src/libpts/pts/pts_meas_algo.h diff --git a/src/libimcv/tcg/pts/pts_proto_caps.h b/src/libpts/pts/pts_proto_caps.h index 4346d9b79..4346d9b79 100644 --- a/src/libimcv/tcg/pts/pts_proto_caps.h +++ b/src/libpts/pts/pts_proto_caps.h diff --git a/src/libimcv/tcg/tcg_attr.c b/src/libpts/tcg/tcg_attr.c index 1ff3b8b3f..1ff3b8b3f 100644 --- a/src/libimcv/tcg/tcg_attr.c +++ b/src/libpts/tcg/tcg_attr.c diff --git a/src/libimcv/tcg/tcg_attr.h b/src/libpts/tcg/tcg_attr.h index d90227d2e..d90227d2e 100644 --- a/src/libimcv/tcg/tcg_attr.h +++ b/src/libpts/tcg/tcg_attr.h diff --git a/src/libimcv/tcg/tcg_pts_attr_aik.c b/src/libpts/tcg/tcg_pts_attr_aik.c index ffef15f29..ffef15f29 100644 --- a/src/libimcv/tcg/tcg_pts_attr_aik.c +++ b/src/libpts/tcg/tcg_pts_attr_aik.c diff --git a/src/libimcv/tcg/tcg_pts_attr_aik.h b/src/libpts/tcg/tcg_pts_attr_aik.h index 96e90582b..96e90582b 100644 --- a/src/libimcv/tcg/tcg_pts_attr_aik.h +++ b/src/libpts/tcg/tcg_pts_attr_aik.h diff --git a/src/libimcv/tcg/tcg_pts_attr_file_meas.c b/src/libpts/tcg/tcg_pts_attr_file_meas.c index dc6980772..dc6980772 100644 --- a/src/libimcv/tcg/tcg_pts_attr_file_meas.c +++ b/src/libpts/tcg/tcg_pts_attr_file_meas.c diff --git a/src/libimcv/tcg/tcg_pts_attr_file_meas.h b/src/libpts/tcg/tcg_pts_attr_file_meas.h index c432ba9a9..c432ba9a9 100644 --- a/src/libimcv/tcg/tcg_pts_attr_file_meas.h +++ b/src/libpts/tcg/tcg_pts_attr_file_meas.h diff --git a/src/libimcv/tcg/tcg_pts_attr_gen_attest_evid.c b/src/libpts/tcg/tcg_pts_attr_gen_attest_evid.c index 4d8aa7bee..4d8aa7bee 100644 --- a/src/libimcv/tcg/tcg_pts_attr_gen_attest_evid.c +++ b/src/libpts/tcg/tcg_pts_attr_gen_attest_evid.c diff --git a/src/libimcv/tcg/tcg_pts_attr_gen_attest_evid.h b/src/libpts/tcg/tcg_pts_attr_gen_attest_evid.h index 0a65f2143..0a65f2143 100644 --- a/src/libimcv/tcg/tcg_pts_attr_gen_attest_evid.h +++ b/src/libpts/tcg/tcg_pts_attr_gen_attest_evid.h diff --git a/src/libimcv/tcg/tcg_pts_attr_get_aik.c b/src/libpts/tcg/tcg_pts_attr_get_aik.c index 727c7a211..727c7a211 100644 --- a/src/libimcv/tcg/tcg_pts_attr_get_aik.c +++ b/src/libpts/tcg/tcg_pts_attr_get_aik.c diff --git a/src/libimcv/tcg/tcg_pts_attr_get_aik.h b/src/libpts/tcg/tcg_pts_attr_get_aik.h index e5c74b4dc..e5c74b4dc 100644 --- a/src/libimcv/tcg/tcg_pts_attr_get_aik.h +++ b/src/libpts/tcg/tcg_pts_attr_get_aik.h diff --git a/src/libimcv/tcg/tcg_pts_attr_get_tpm_version_info.c b/src/libpts/tcg/tcg_pts_attr_get_tpm_version_info.c index 51cb99a8e..51cb99a8e 100644 --- a/src/libimcv/tcg/tcg_pts_attr_get_tpm_version_info.c +++ b/src/libpts/tcg/tcg_pts_attr_get_tpm_version_info.c diff --git a/src/libimcv/tcg/tcg_pts_attr_get_tpm_version_info.h b/src/libpts/tcg/tcg_pts_attr_get_tpm_version_info.h index 255efaafa..255efaafa 100644 --- a/src/libimcv/tcg/tcg_pts_attr_get_tpm_version_info.h +++ b/src/libpts/tcg/tcg_pts_attr_get_tpm_version_info.h diff --git a/src/libimcv/tcg/tcg_pts_attr_meas_algo.c b/src/libpts/tcg/tcg_pts_attr_meas_algo.c index dffc15320..dffc15320 100644 --- a/src/libimcv/tcg/tcg_pts_attr_meas_algo.c +++ b/src/libpts/tcg/tcg_pts_attr_meas_algo.c diff --git a/src/libimcv/tcg/tcg_pts_attr_meas_algo.h b/src/libpts/tcg/tcg_pts_attr_meas_algo.h index 885e2c16b..885e2c16b 100644 --- a/src/libimcv/tcg/tcg_pts_attr_meas_algo.h +++ b/src/libpts/tcg/tcg_pts_attr_meas_algo.h diff --git a/src/libimcv/tcg/tcg_pts_attr_proto_caps.c b/src/libpts/tcg/tcg_pts_attr_proto_caps.c index 6d078905d..6d078905d 100644 --- a/src/libimcv/tcg/tcg_pts_attr_proto_caps.c +++ b/src/libpts/tcg/tcg_pts_attr_proto_caps.c diff --git a/src/libimcv/tcg/tcg_pts_attr_proto_caps.h b/src/libpts/tcg/tcg_pts_attr_proto_caps.h index 15cfbc7cb..15cfbc7cb 100644 --- a/src/libimcv/tcg/tcg_pts_attr_proto_caps.h +++ b/src/libpts/tcg/tcg_pts_attr_proto_caps.h diff --git a/src/libimcv/tcg/tcg_pts_attr_req_file_meas.c b/src/libpts/tcg/tcg_pts_attr_req_file_meas.c index 68ecfa8f1..68ecfa8f1 100644 --- a/src/libimcv/tcg/tcg_pts_attr_req_file_meas.c +++ b/src/libpts/tcg/tcg_pts_attr_req_file_meas.c diff --git a/src/libimcv/tcg/tcg_pts_attr_req_file_meas.h b/src/libpts/tcg/tcg_pts_attr_req_file_meas.h index 19d189eff..19d189eff 100644 --- a/src/libimcv/tcg/tcg_pts_attr_req_file_meas.h +++ b/src/libpts/tcg/tcg_pts_attr_req_file_meas.h diff --git a/src/libimcv/tcg/tcg_pts_attr_req_funct_comp_evid.c b/src/libpts/tcg/tcg_pts_attr_req_funct_comp_evid.c index 0f460580b..0f460580b 100644 --- a/src/libimcv/tcg/tcg_pts_attr_req_funct_comp_evid.c +++ b/src/libpts/tcg/tcg_pts_attr_req_funct_comp_evid.c diff --git a/src/libimcv/tcg/tcg_pts_attr_req_funct_comp_evid.h b/src/libpts/tcg/tcg_pts_attr_req_funct_comp_evid.h index 215ce6408..215ce6408 100644 --- a/src/libimcv/tcg/tcg_pts_attr_req_funct_comp_evid.h +++ b/src/libpts/tcg/tcg_pts_attr_req_funct_comp_evid.h diff --git a/src/libimcv/tcg/tcg_pts_attr_simple_comp_evid.c b/src/libpts/tcg/tcg_pts_attr_simple_comp_evid.c index 84b31724e..84b31724e 100644 --- a/src/libimcv/tcg/tcg_pts_attr_simple_comp_evid.c +++ b/src/libpts/tcg/tcg_pts_attr_simple_comp_evid.c diff --git a/src/libimcv/tcg/tcg_pts_attr_simple_comp_evid.h b/src/libpts/tcg/tcg_pts_attr_simple_comp_evid.h index 5da20e96e..5da20e96e 100644 --- a/src/libimcv/tcg/tcg_pts_attr_simple_comp_evid.h +++ b/src/libpts/tcg/tcg_pts_attr_simple_comp_evid.h diff --git a/src/libimcv/tcg/tcg_pts_attr_simple_evid_final.c b/src/libpts/tcg/tcg_pts_attr_simple_evid_final.c index fa2f6e5c6..fa2f6e5c6 100644 --- a/src/libimcv/tcg/tcg_pts_attr_simple_evid_final.c +++ b/src/libpts/tcg/tcg_pts_attr_simple_evid_final.c diff --git a/src/libimcv/tcg/tcg_pts_attr_simple_evid_final.h b/src/libpts/tcg/tcg_pts_attr_simple_evid_final.h index 351981921..351981921 100644 --- a/src/libimcv/tcg/tcg_pts_attr_simple_evid_final.h +++ b/src/libpts/tcg/tcg_pts_attr_simple_evid_final.h diff --git a/src/libimcv/tcg/tcg_pts_attr_tpm_version_info.c b/src/libpts/tcg/tcg_pts_attr_tpm_version_info.c index 300199382..300199382 100644 --- a/src/libimcv/tcg/tcg_pts_attr_tpm_version_info.c +++ b/src/libpts/tcg/tcg_pts_attr_tpm_version_info.c diff --git a/src/libimcv/tcg/tcg_pts_attr_tpm_version_info.h b/src/libpts/tcg/tcg_pts_attr_tpm_version_info.h index 2c12bb068..2c12bb068 100644 --- a/src/libimcv/tcg/tcg_pts_attr_tpm_version_info.h +++ b/src/libpts/tcg/tcg_pts_attr_tpm_version_info.h |