created libpts

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

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

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 \
+	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
 
 SUBDIRS = .
 
+if USE_PTS
+  INCLUDES += -I$(top_srcdir)/src/libpts
+  AM_CFLAGS = -DUSE_PTS
+endif
+
 if USE_IMC_TEST
   SUBDIRS += plugins/imc_test
 endif

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)
 			{

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:

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

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>

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;

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

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 <pts/pts_database.h>
-#include <tcg/pts/pts_creds.h>
+#include <pts/pts_creds.h>
-#include <tcg/pts/pts_error.h>
+#include <pts/pts_error.h>
 
 #include <tcg/tcg_attr.h>
 #include <tcg/tcg_pts_attr_proto_caps.h>

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;

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