]> git.ipfire.org Git - thirdparty/strongswan.git/commitdiff
Merged libpts into libimcv
authorAndreas Steffen <andreas.steffen@strongswan.org>
Fri, 29 Aug 2014 10:18:21 +0000 (12:18 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Sun, 5 Oct 2014 10:55:37 +0000 (12:55 +0200)
159 files changed:
configure.ac
src/Makefile.am
src/checksum/Makefile.am
src/libimcv/Android.mk
src/libimcv/Makefile.am
src/libimcv/imc/imc_msg.c
src/libimcv/imcv.c
src/libimcv/imcv.h
src/libimcv/imv/imv_msg.c
src/libimcv/plugins/imc_attestation/Makefile.am [moved from src/libpts/plugins/imc_attestation/Makefile.am with 74% similarity]
src/libimcv/plugins/imc_attestation/imc_attestation.c [moved from src/libpts/plugins/imc_attestation/imc_attestation.c with 98% similarity]
src/libimcv/plugins/imc_attestation/imc_attestation_process.c [moved from src/libpts/plugins/imc_attestation/imc_attestation_process.c with 100% similarity]
src/libimcv/plugins/imc_attestation/imc_attestation_process.h [moved from src/libpts/plugins/imc_attestation/imc_attestation_process.h with 100% similarity]
src/libimcv/plugins/imc_attestation/imc_attestation_state.c [moved from src/libpts/plugins/imc_attestation/imc_attestation_state.c with 98% similarity]
src/libimcv/plugins/imc_attestation/imc_attestation_state.h [moved from src/libpts/plugins/imc_attestation/imc_attestation_state.h with 98% similarity]
src/libimcv/plugins/imc_swid/.gitignore [moved from src/libpts/plugins/imc_swid/.gitignore with 100% similarity]
src/libimcv/plugins/imc_swid/Makefile.am [moved from src/libpts/plugins/imc_swid/Makefile.am with 94% similarity]
src/libimcv/plugins/imc_swid/imc_swid.c [moved from src/libpts/plugins/imc_swid/imc_swid.c with 99% similarity]
src/libimcv/plugins/imc_swid/imc_swid_state.c [moved from src/libpts/plugins/imc_swid/imc_swid_state.c with 100% similarity]
src/libimcv/plugins/imc_swid/imc_swid_state.h [moved from src/libpts/plugins/imc_swid/imc_swid_state.h with 100% similarity]
src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_apache-2-2-22-13.swidtag [moved from src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_apache-2-2-22-13.swidtag with 100% similarity]
src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_bind-9-8-4-dfsg.swidtag [moved from src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_bind-9-8-4-dfsg.swidtag with 100% similarity]
src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libsqlite-3-7-13-1.swidtag [moved from src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libsqlite-3-7-13-1.swidtag with 100% similarity]
src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-1-0-1e-2.swidtag [moved from src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-1-0-1e-2.swidtag with 100% similarity]
src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-dev-1-0-1e-2.swidtag [moved from src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-dev-1-0-1e-2.swidtag with 100% similarity]
src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_openssl-1-0-1e-2.swidtag [moved from src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_openssl-1-0-1e-2.swidtag with 100% similarity]
src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_sqlite-3-7-13-1.swidtag [moved from src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_sqlite-3-7-13-1.swidtag with 100% similarity]
src/libimcv/plugins/imc_swid/regid.2004-03.org.strongswan_strongSwan.swidtag.in [moved from src/libpts/plugins/imc_swid/regid.2004-03.org.strongswan_strongSwan.swidtag.in with 100% similarity]
src/libimcv/plugins/imv_attestation/.gitignore [moved from src/libpts/plugins/imv_attestation/.gitignore with 100% similarity]
src/libimcv/plugins/imv_attestation/Makefile.am [moved from src/libpts/plugins/imv_attestation/Makefile.am with 84% similarity]
src/libimcv/plugins/imv_attestation/attest.c [moved from src/libpts/plugins/imv_attestation/attest.c with 99% similarity]
src/libimcv/plugins/imv_attestation/attest_db.c [moved from src/libpts/plugins/imv_attestation/attest_db.c with 99% similarity]
src/libimcv/plugins/imv_attestation/attest_db.h [moved from src/libpts/plugins/imv_attestation/attest_db.h with 100% similarity]
src/libimcv/plugins/imv_attestation/attest_usage.c [moved from src/libpts/plugins/imv_attestation/attest_usage.c with 100% similarity]
src/libimcv/plugins/imv_attestation/attest_usage.h [moved from src/libpts/plugins/imv_attestation/attest_usage.h with 100% similarity]
src/libimcv/plugins/imv_attestation/build-database.sh [moved from src/libpts/plugins/imv_attestation/build-database.sh with 100% similarity]
src/libimcv/plugins/imv_attestation/imv_attestation.c [moved from src/libpts/plugins/imv_attestation/imv_attestation.c with 100% similarity]
src/libimcv/plugins/imv_attestation/imv_attestation_agent.c [moved from src/libpts/plugins/imv_attestation/imv_attestation_agent.c with 99% similarity]
src/libimcv/plugins/imv_attestation/imv_attestation_agent.h [moved from src/libpts/plugins/imv_attestation/imv_attestation_agent.h with 100% similarity]
src/libimcv/plugins/imv_attestation/imv_attestation_build.c [moved from src/libpts/plugins/imv_attestation/imv_attestation_build.c with 100% similarity]
src/libimcv/plugins/imv_attestation/imv_attestation_build.h [moved from src/libpts/plugins/imv_attestation/imv_attestation_build.h with 100% similarity]
src/libimcv/plugins/imv_attestation/imv_attestation_process.c [moved from src/libpts/plugins/imv_attestation/imv_attestation_process.c with 100% similarity]
src/libimcv/plugins/imv_attestation/imv_attestation_process.h [moved from src/libpts/plugins/imv_attestation/imv_attestation_process.h with 100% similarity]
src/libimcv/plugins/imv_attestation/imv_attestation_state.c [moved from src/libpts/plugins/imv_attestation/imv_attestation_state.c with 99% similarity]
src/libimcv/plugins/imv_attestation/imv_attestation_state.h [moved from src/libpts/plugins/imv_attestation/imv_attestation_state.h with 99% similarity]
src/libimcv/plugins/imv_swid/Makefile.am [moved from src/libpts/plugins/imv_swid/Makefile.am with 83% similarity]
src/libimcv/plugins/imv_swid/imv_swid.c [moved from src/libpts/plugins/imv_swid/imv_swid.c with 100% similarity]
src/libimcv/plugins/imv_swid/imv_swid_agent.c [moved from src/libpts/plugins/imv_swid/imv_swid_agent.c with 99% similarity]
src/libimcv/plugins/imv_swid/imv_swid_agent.h [moved from src/libpts/plugins/imv_swid/imv_swid_agent.h with 100% similarity]
src/libimcv/plugins/imv_swid/imv_swid_rest.c [moved from src/libpts/plugins/imv_swid/imv_swid_rest.c with 100% similarity]
src/libimcv/plugins/imv_swid/imv_swid_rest.h [moved from src/libpts/plugins/imv_swid/imv_swid_rest.h with 100% similarity]
src/libimcv/plugins/imv_swid/imv_swid_state.c [moved from src/libpts/plugins/imv_swid/imv_swid_state.c with 100% similarity]
src/libimcv/plugins/imv_swid/imv_swid_state.h [moved from src/libpts/plugins/imv_swid/imv_swid_state.h with 100% similarity]
src/libimcv/pts/components/ita/ita_comp_func_name.c [moved from src/libpts/pts/components/ita/ita_comp_func_name.c with 100% similarity]
src/libimcv/pts/components/ita/ita_comp_func_name.h [moved from src/libpts/pts/components/ita/ita_comp_func_name.h with 100% similarity]
src/libimcv/pts/components/ita/ita_comp_ima.c [moved from src/libpts/pts/components/ita/ita_comp_ima.c with 99% similarity]
src/libimcv/pts/components/ita/ita_comp_ima.h [moved from src/libpts/pts/components/ita/ita_comp_ima.h with 100% similarity]
src/libimcv/pts/components/ita/ita_comp_tboot.c [moved from src/libpts/pts/components/ita/ita_comp_tboot.c with 97% similarity]
src/libimcv/pts/components/ita/ita_comp_tboot.h [moved from src/libpts/pts/components/ita/ita_comp_tboot.h with 100% similarity]
src/libimcv/pts/components/ita/ita_comp_tgrub.c [moved from src/libpts/pts/components/ita/ita_comp_tgrub.c with 100% similarity]
src/libimcv/pts/components/ita/ita_comp_tgrub.h [moved from src/libpts/pts/components/ita/ita_comp_tgrub.h with 100% similarity]
src/libimcv/pts/components/pts_comp_evidence.c [moved from src/libpts/pts/components/pts_comp_evidence.c with 100% similarity]
src/libimcv/pts/components/pts_comp_evidence.h [moved from src/libpts/pts/components/pts_comp_evidence.h with 100% similarity]
src/libimcv/pts/components/pts_comp_func_name.c [moved from src/libpts/pts/components/pts_comp_func_name.c with 90% similarity]
src/libimcv/pts/components/pts_comp_func_name.h [moved from src/libpts/pts/components/pts_comp_func_name.h with 100% similarity]
src/libimcv/pts/components/pts_component.h [moved from src/libpts/pts/components/pts_component.h with 100% similarity]
src/libimcv/pts/components/pts_component_manager.c [moved from src/libpts/pts/components/pts_component_manager.c with 100% similarity]
src/libimcv/pts/components/pts_component_manager.h [moved from src/libpts/pts/components/pts_component_manager.h with 100% similarity]
src/libimcv/pts/components/tcg/tcg_comp_func_name.c [moved from src/libpts/pts/components/tcg/tcg_comp_func_name.c with 100% similarity]
src/libimcv/pts/components/tcg/tcg_comp_func_name.h [moved from src/libpts/pts/components/tcg/tcg_comp_func_name.h with 100% similarity]
src/libimcv/pts/pts.c [moved from src/libpts/pts/pts.c with 100% similarity]
src/libimcv/pts/pts.h [moved from src/libpts/pts/pts.h with 100% similarity]
src/libimcv/pts/pts_creds.c [moved from src/libpts/pts/pts_creds.c with 100% similarity]
src/libimcv/pts/pts_creds.h [moved from src/libpts/pts/pts_creds.h with 100% similarity]
src/libimcv/pts/pts_database.c [moved from src/libpts/pts/pts_database.c with 100% similarity]
src/libimcv/pts/pts_database.h [moved from src/libpts/pts/pts_database.h with 100% similarity]
src/libimcv/pts/pts_dh_group.c [moved from src/libpts/pts/pts_dh_group.c with 100% similarity]
src/libimcv/pts/pts_dh_group.h [moved from src/libpts/pts/pts_dh_group.h with 100% similarity]
src/libimcv/pts/pts_error.c [moved from src/libpts/pts/pts_error.c with 100% similarity]
src/libimcv/pts/pts_error.h [moved from src/libpts/pts/pts_error.h with 100% similarity]
src/libimcv/pts/pts_file_meas.c [moved from src/libpts/pts/pts_file_meas.c with 100% similarity]
src/libimcv/pts/pts_file_meas.h [moved from src/libpts/pts/pts_file_meas.h with 100% similarity]
src/libimcv/pts/pts_file_meta.c [moved from src/libpts/pts/pts_file_meta.c with 100% similarity]
src/libimcv/pts/pts_file_meta.h [moved from src/libpts/pts/pts_file_meta.h with 100% similarity]
src/libimcv/pts/pts_file_type.c [moved from src/libpts/pts/pts_file_type.c with 100% similarity]
src/libimcv/pts/pts_file_type.h [moved from src/libpts/pts/pts_file_type.h with 100% similarity]
src/libimcv/pts/pts_ima_bios_list.c [moved from src/libpts/pts/pts_ima_bios_list.c with 100% similarity]
src/libimcv/pts/pts_ima_bios_list.h [moved from src/libpts/pts/pts_ima_bios_list.h with 100% similarity]
src/libimcv/pts/pts_ima_event_list.c [moved from src/libpts/pts/pts_ima_event_list.c with 100% similarity]
src/libimcv/pts/pts_ima_event_list.h [moved from src/libpts/pts/pts_ima_event_list.h with 100% similarity]
src/libimcv/pts/pts_meas_algo.c [moved from src/libpts/pts/pts_meas_algo.c with 100% similarity]
src/libimcv/pts/pts_meas_algo.h [moved from src/libpts/pts/pts_meas_algo.h with 100% similarity]
src/libimcv/pts/pts_pcr.c [moved from src/libpts/pts/pts_pcr.c with 100% similarity]
src/libimcv/pts/pts_pcr.h [moved from src/libpts/pts/pts_pcr.h with 100% similarity]
src/libimcv/pts/pts_proto_caps.h [moved from src/libpts/pts/pts_proto_caps.h with 100% similarity]
src/libimcv/pts/pts_req_func_comp_evid.h [moved from src/libpts/pts/pts_req_func_comp_evid.h with 100% similarity]
src/libimcv/pts/pts_simple_evid_final.h [moved from src/libpts/pts/pts_simple_evid_final.h with 100% similarity]
src/libimcv/seg/seg_contract.c
src/libimcv/seg/seg_env.c
src/libimcv/swid/swid_error.c [moved from src/libpts/swid/swid_error.c with 100% similarity]
src/libimcv/swid/swid_error.h [moved from src/libpts/swid/swid_error.h with 100% similarity]
src/libimcv/swid/swid_inventory.c [moved from src/libpts/swid/swid_inventory.c with 100% similarity]
src/libimcv/swid/swid_inventory.h [moved from src/libpts/swid/swid_inventory.h with 100% similarity]
src/libimcv/swid/swid_tag.c [moved from src/libpts/swid/swid_tag.c with 100% similarity]
src/libimcv/swid/swid_tag.h [moved from src/libpts/swid/swid_tag.h with 100% similarity]
src/libimcv/swid/swid_tag_id.c [moved from src/libpts/swid/swid_tag_id.c with 100% similarity]
src/libimcv/swid/swid_tag_id.h [moved from src/libpts/swid/swid_tag_id.h with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_aik.c [moved from src/libpts/tcg/pts/tcg_pts_attr_aik.c with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_aik.h [moved from src/libpts/tcg/pts/tcg_pts_attr_aik.h with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_finish.c [moved from src/libpts/tcg/pts/tcg_pts_attr_dh_nonce_finish.c with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_finish.h [moved from src/libpts/tcg/pts/tcg_pts_attr_dh_nonce_finish.h with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_params_req.c [moved from src/libpts/tcg/pts/tcg_pts_attr_dh_nonce_params_req.c with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_params_req.h [moved from src/libpts/tcg/pts/tcg_pts_attr_dh_nonce_params_req.h with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_params_resp.c [moved from src/libpts/tcg/pts/tcg_pts_attr_dh_nonce_params_resp.c with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_params_resp.h [moved from src/libpts/tcg/pts/tcg_pts_attr_dh_nonce_params_resp.h with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_file_meas.c [moved from src/libpts/tcg/pts/tcg_pts_attr_file_meas.c with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_file_meas.h [moved from src/libpts/tcg/pts/tcg_pts_attr_file_meas.h with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_gen_attest_evid.c [moved from src/libpts/tcg/pts/tcg_pts_attr_gen_attest_evid.c with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_gen_attest_evid.h [moved from src/libpts/tcg/pts/tcg_pts_attr_gen_attest_evid.h with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_get_aik.c [moved from src/libpts/tcg/pts/tcg_pts_attr_get_aik.c with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_get_aik.h [moved from src/libpts/tcg/pts/tcg_pts_attr_get_aik.h with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_get_tpm_version_info.c [moved from src/libpts/tcg/pts/tcg_pts_attr_get_tpm_version_info.c with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_get_tpm_version_info.h [moved from src/libpts/tcg/pts/tcg_pts_attr_get_tpm_version_info.h with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_meas_algo.c [moved from src/libpts/tcg/pts/tcg_pts_attr_meas_algo.c with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_meas_algo.h [moved from src/libpts/tcg/pts/tcg_pts_attr_meas_algo.h with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_proto_caps.c [moved from src/libpts/tcg/pts/tcg_pts_attr_proto_caps.c with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_proto_caps.h [moved from src/libpts/tcg/pts/tcg_pts_attr_proto_caps.h with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_req_file_meas.c [moved from src/libpts/tcg/pts/tcg_pts_attr_req_file_meas.c with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_req_file_meas.h [moved from src/libpts/tcg/pts/tcg_pts_attr_req_file_meas.h with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_req_file_meta.c [moved from src/libpts/tcg/pts/tcg_pts_attr_req_file_meta.c with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_req_file_meta.h [moved from src/libpts/tcg/pts/tcg_pts_attr_req_file_meta.h with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_req_func_comp_evid.c [moved from src/libpts/tcg/pts/tcg_pts_attr_req_func_comp_evid.c with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_req_func_comp_evid.h [moved from src/libpts/tcg/pts/tcg_pts_attr_req_func_comp_evid.h with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_simple_comp_evid.c [moved from src/libpts/tcg/pts/tcg_pts_attr_simple_comp_evid.c with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_simple_comp_evid.h [moved from src/libpts/tcg/pts/tcg_pts_attr_simple_comp_evid.h with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_simple_evid_final.c [moved from src/libpts/tcg/pts/tcg_pts_attr_simple_evid_final.c with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_simple_evid_final.h [moved from src/libpts/tcg/pts/tcg_pts_attr_simple_evid_final.h with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_tpm_version_info.c [moved from src/libpts/tcg/pts/tcg_pts_attr_tpm_version_info.c with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_tpm_version_info.h [moved from src/libpts/tcg/pts/tcg_pts_attr_tpm_version_info.h with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_unix_file_meta.c [moved from src/libpts/tcg/pts/tcg_pts_attr_unix_file_meta.c with 100% similarity]
src/libimcv/tcg/pts/tcg_pts_attr_unix_file_meta.h [moved from src/libpts/tcg/pts/tcg_pts_attr_unix_file_meta.h with 100% similarity]
src/libimcv/tcg/seg/tcg_seg_attr_max_size.c [moved from src/libpts/tcg/seg/tcg_seg_attr_max_size.c with 100% similarity]
src/libimcv/tcg/seg/tcg_seg_attr_max_size.h [moved from src/libpts/tcg/seg/tcg_seg_attr_max_size.h with 100% similarity]
src/libimcv/tcg/seg/tcg_seg_attr_next_seg.c [moved from src/libpts/tcg/seg/tcg_seg_attr_next_seg.c with 100% similarity]
src/libimcv/tcg/seg/tcg_seg_attr_next_seg.h [moved from src/libpts/tcg/seg/tcg_seg_attr_next_seg.h with 100% similarity]
src/libimcv/tcg/seg/tcg_seg_attr_seg_env.c [moved from src/libpts/tcg/seg/tcg_seg_attr_seg_env.c with 100% similarity]
src/libimcv/tcg/seg/tcg_seg_attr_seg_env.h [moved from src/libpts/tcg/seg/tcg_seg_attr_seg_env.h with 100% similarity]
src/libimcv/tcg/swid/tcg_swid_attr_req.c [moved from src/libpts/tcg/swid/tcg_swid_attr_req.c with 100% similarity]
src/libimcv/tcg/swid/tcg_swid_attr_req.h [moved from src/libpts/tcg/swid/tcg_swid_attr_req.h with 100% similarity]
src/libimcv/tcg/swid/tcg_swid_attr_tag_id_inv.c [moved from src/libpts/tcg/swid/tcg_swid_attr_tag_id_inv.c with 100% similarity]
src/libimcv/tcg/swid/tcg_swid_attr_tag_id_inv.h [moved from src/libpts/tcg/swid/tcg_swid_attr_tag_id_inv.h with 100% similarity]
src/libimcv/tcg/swid/tcg_swid_attr_tag_inv.c [moved from src/libpts/tcg/swid/tcg_swid_attr_tag_inv.c with 100% similarity]
src/libimcv/tcg/swid/tcg_swid_attr_tag_inv.h [moved from src/libpts/tcg/swid/tcg_swid_attr_tag_inv.h with 100% similarity]
src/libimcv/tcg/tcg_attr.c [moved from src/libpts/tcg/tcg_attr.c with 100% similarity]
src/libimcv/tcg/tcg_attr.h [moved from src/libpts/tcg/tcg_attr.h with 100% similarity]
src/libpts/Android.mk [deleted file]
src/libpts/Makefile.am [deleted file]
src/libpts/libpts.c [deleted file]
src/libpts/libpts.h [deleted file]

index 61b99e52b753063262ac0055b1f23208e2f82283..85f7cb35c9770842ff70ee4d46aaa1e6055a817c 100644 (file)
@@ -397,10 +397,6 @@ 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 -o x$imc_swid = xtrue -o x$imv_swid = xtrue; then
-       pts=true;
-fi
-
 if test x$fips_prf = xtrue; then
        if test x$openssl = xfalse; then
                sha1=true;
@@ -1500,7 +1496,6 @@ AM_CONDITIONAL(USE_SIMAKA, test x$simaka = xtrue)
 AM_CONDITIONAL(USE_TLS, test x$tls = xtrue)
 AM_CONDITIONAL(USE_RADIUS, test x$radius = xtrue)
 AM_CONDITIONAL(USE_IMCV, test x$imcv = xtrue)
-AM_CONDITIONAL(USE_PTS, test x$pts = xtrue)
 AM_CONDITIONAL(USE_TROUSERS, test x$tss = xtrousers -o x$aikgen = xtrue)
 AM_CONDITIONAL(MONOLITHIC, test x$monolithic = xtrue)
 AM_CONDITIONAL(USE_SILENT_RULES, test x$enable_silent_rules = xyes)
@@ -1640,11 +1635,6 @@ AC_CONFIG_FILES([
        src/libtnccs/plugins/tnccs_20/Makefile
        src/libtnccs/plugins/tnccs_dynamic/Makefile
        src/libpttls/Makefile
-       src/libpts/Makefile
-       src/libpts/plugins/imc_attestation/Makefile
-       src/libpts/plugins/imv_attestation/Makefile
-       src/libpts/plugins/imc_swid/Makefile
-       src/libpts/plugins/imv_swid/Makefile
        src/libimcv/Makefile
        src/libimcv/plugins/imc_test/Makefile
        src/libimcv/plugins/imv_test/Makefile
@@ -1652,6 +1642,10 @@ AC_CONFIG_FILES([
        src/libimcv/plugins/imv_scanner/Makefile
        src/libimcv/plugins/imc_os/Makefile
        src/libimcv/plugins/imv_os/Makefile
+       src/libimcv/plugins/imc_attestation/Makefile
+       src/libimcv/plugins/imv_attestation/Makefile
+       src/libimcv/plugins/imc_swid/Makefile
+       src/libimcv/plugins/imv_swid/Makefile
        src/charon/Makefile
        src/charon-nm/Makefile
        src/charon-tkm/Makefile
index 603c9d1642270bc56353ccec32ce9e3606a9f3f3..38363d4f7a8a444bca3509cea275139fcaf9d912 100644 (file)
@@ -40,10 +40,6 @@ if USE_IMCV
   SUBDIRS += libimcv
 endif
 
-if USE_PTS
-  SUBDIRS += libpts
-endif
-
 if USE_LIBCHARON
   SUBDIRS += libcharon
 endif
index 821c51747bf266669d7a03df97c49d03e71f6210..b358699d0cbc7e2186b6889a5ebf42ef678ad748 100644 (file)
@@ -81,11 +81,6 @@ if USE_IMCV
   libs += $(DESTDIR)$(ipseclibdir)/libimcv.so
 endif
 
-if USE_PTS
-  deps += $(top_builddir)/src/libpts/libpts.la
-  libs += $(DESTDIR)$(ipseclibdir)/libpts.so
-endif
-
 if USE_CHARON
   deps += $(top_builddir)/src/libcharon/libcharon.la
   libs += $(DESTDIR)$(ipseclibdir)/libcharon.so
index 4253fe2747e5dbc6fb6eca1ff7168ea7d3f77d8f..d7ea015bbde94dfd686fa3e3fdac882f50652a37 100644 (file)
@@ -41,7 +41,59 @@ libimcv_la_SOURCES := \
        os_info/os_info.h os_info/os_info.c \
        pa_tnc/pa_tnc_attr.h \
        pa_tnc/pa_tnc_msg.h pa_tnc/pa_tnc_msg.c \
-       pa_tnc/pa_tnc_attr_manager.h pa_tnc/pa_tnc_attr_manager.c
+       pa_tnc/pa_tnc_attr_manager.h pa_tnc/pa_tnc_attr_manager.c \
+       pts/pts.h pts/pts.c \
+       pts/pts_error.h pts/pts_error.c \
+       pts/pts_pcr.h pts/pts_pcr.c \
+       pts/pts_proto_caps.h \
+       pts/pts_req_func_comp_evid.h \
+       pts/pts_simple_evid_final.h \
+       pts/pts_creds.h pts/pts_creds.c \
+       pts/pts_database.h pts/pts_database.c \
+       pts/pts_dh_group.h pts/pts_dh_group.c \
+       pts/pts_file_meas.h pts/pts_file_meas.c \
+       pts/pts_file_meta.h pts/pts_file_meta.c \
+       pts/pts_file_type.h pts/pts_file_type.c \
+       pts/pts_ima_bios_list.h pts/pts_ima_bios_list.c \
+       pts/pts_ima_event_list.h pts/pts_ima_event_list.c \
+       pts/pts_meas_algo.h pts/pts_meas_algo.c \
+       pts/components/pts_component.h \
+       pts/components/pts_component_manager.h pts/components/pts_component_manager.c \
+       pts/components/pts_comp_evidence.h pts/components/pts_comp_evidence.c \
+       pts/components/pts_comp_func_name.h pts/components/pts_comp_func_name.c \
+       pts/components/ita/ita_comp_func_name.h pts/components/ita/ita_comp_func_name.c \
+       pts/components/ita/ita_comp_ima.h pts/components/ita/ita_comp_ima.c \
+       pts/components/ita/ita_comp_tboot.h pts/components/ita/ita_comp_tboot.c \
+       pts/components/ita/ita_comp_tgrub.h pts/components/ita/ita_comp_tgrub.c \
+       pts/components/tcg/tcg_comp_func_name.h pts/components/tcg/tcg_comp_func_name.c \
+       seg/seg_contract.h seg/seg_contract.c \
+       seg/seg_contract_manager.h seg/seg_contract_manager.c \
+       seg/seg_env.h seg/seg_env.c \
+       swid/swid_error.h swid/swid_error.c \
+       swid/swid_inventory.h swid/swid_inventory.c \
+       swid/swid_tag.h swid/swid_tag.c \
+       swid/swid_tag_id.h swid/swid_tag_id.c \
+       tcg/tcg_attr.h tcg/tcg_attr.c \
+       tcg/pts/tcg_pts_attr_proto_caps.h tcg/pts/tcg_pts_attr_proto_caps.c \
+       tcg/pts/tcg_pts_attr_dh_nonce_params_req.h tcg/pts/tcg_pts_attr_dh_nonce_params_req.c \
+       tcg/pts/tcg_pts_attr_dh_nonce_params_resp.h tcg/pts/tcg_pts_attr_dh_nonce_params_resp.c \
+       tcg/pts/tcg_pts_attr_dh_nonce_finish.h tcg/pts/tcg_pts_attr_dh_nonce_finish.c \
+       tcg/pts/tcg_pts_attr_meas_algo.h tcg/pts/tcg_pts_attr_meas_algo.c \
+       tcg/pts/tcg_pts_attr_get_tpm_version_info.h tcg/pts/tcg_pts_attr_get_tpm_version_info.c \
+       tcg/pts/tcg_pts_attr_tpm_version_info.h tcg/pts/tcg_pts_attr_tpm_version_info.c \
+       tcg/pts/tcg_pts_attr_get_aik.h tcg/pts/tcg_pts_attr_get_aik.c \
+       tcg/pts/tcg_pts_attr_aik.h tcg/pts/tcg_pts_attr_aik.c \
+       tcg/pts/tcg_pts_attr_req_func_comp_evid.h tcg/pts/tcg_pts_attr_req_func_comp_evid.c \
+       tcg/pts/tcg_pts_attr_gen_attest_evid.h tcg/pts/tcg_pts_attr_gen_attest_evid.c \
+       tcg/pts/tcg_pts_attr_simple_comp_evid.h tcg/pts/tcg_pts_attr_simple_comp_evid.c \
+       tcg/pts/tcg_pts_attr_simple_evid_final.h tcg/pts/tcg_pts_attr_simple_evid_final.c \
+       tcg/pts/tcg_pts_attr_req_file_meas.h tcg/pts/tcg_pts_attr_req_file_meas.c \
+       tcg/pts/tcg_pts_attr_file_meas.h tcg/pts/tcg_pts_attr_file_meas.c \
+       tcg/pts/tcg_pts_attr_req_file_meta.h tcg/pts/tcg_pts_attr_req_file_meta.c \
+       tcg/pts/tcg_pts_attr_unix_file_meta.h tcg/pts/tcg_pts_attr_unix_file_meta.c \
+       tcg/swid/tcg_swid_attr_req.h tcg/swid/tcg_swid_attr_req.c \
+       tcg/swid/tcg_swid_attr_tag_id_inv.h tcg/swid/tcg_swid_attr_tag_id_inv.c \
+       tcg/swid/tcg_swid_attr_tag_inv.h tcg/swid/tcg_swid_attr_tag_inv.c
 
 LOCAL_SRC_FILES := $(filter %.c,$(libimcv_la_SOURCES))
 
index 37041d2b2017b5dee5754385c765ef98ab2a4f32..5102938dc4c607f0b04473863cb239bf634ac1e9 100644 (file)
@@ -12,6 +12,10 @@ libimcv_la_LIBADD = \
        $(top_builddir)/src/libstrongswan/libstrongswan.la \
        $(top_builddir)/src/libtncif/libtncif.la
 
+if USE_TROUSERS
+  libimcv_la_LIBADD += -ltspi
+endif
+
 if USE_WINDOWS
   libimcv_la_LIBADD += -lws2_32
 endif
@@ -56,9 +60,61 @@ libimcv_la_SOURCES = \
        pa_tnc/pa_tnc_attr.h \
        pa_tnc/pa_tnc_msg.h pa_tnc/pa_tnc_msg.c \
        pa_tnc/pa_tnc_attr_manager.h pa_tnc/pa_tnc_attr_manager.c \
+       pts/pts.h pts/pts.c \
+       pts/pts_error.h pts/pts_error.c \
+       pts/pts_pcr.h pts/pts_pcr.c \
+       pts/pts_proto_caps.h \
+       pts/pts_req_func_comp_evid.h \
+       pts/pts_simple_evid_final.h \
+       pts/pts_creds.h pts/pts_creds.c \
+       pts/pts_database.h pts/pts_database.c \
+       pts/pts_dh_group.h pts/pts_dh_group.c \
+       pts/pts_file_meas.h pts/pts_file_meas.c \
+       pts/pts_file_meta.h pts/pts_file_meta.c \
+       pts/pts_file_type.h pts/pts_file_type.c \
+       pts/pts_ima_bios_list.h pts/pts_ima_bios_list.c \
+       pts/pts_ima_event_list.h pts/pts_ima_event_list.c \
+       pts/pts_meas_algo.h pts/pts_meas_algo.c \
+       pts/components/pts_component.h \
+       pts/components/pts_component_manager.h pts/components/pts_component_manager.c \
+       pts/components/pts_comp_evidence.h pts/components/pts_comp_evidence.c \
+       pts/components/pts_comp_func_name.h pts/components/pts_comp_func_name.c \
+       pts/components/ita/ita_comp_func_name.h pts/components/ita/ita_comp_func_name.c \
+       pts/components/ita/ita_comp_ima.h pts/components/ita/ita_comp_ima.c \
+       pts/components/ita/ita_comp_tboot.h pts/components/ita/ita_comp_tboot.c \
+       pts/components/ita/ita_comp_tgrub.h pts/components/ita/ita_comp_tgrub.c \
+       pts/components/tcg/tcg_comp_func_name.h pts/components/tcg/tcg_comp_func_name.c \
        seg/seg_contract.h seg/seg_contract.c \
        seg/seg_contract_manager.h seg/seg_contract_manager.c \
-       seg/seg_env.h seg/seg_env.c
+       seg/seg_env.h seg/seg_env.c \
+       swid/swid_error.h swid/swid_error.c \
+       swid/swid_inventory.h swid/swid_inventory.c \
+       swid/swid_tag.h swid/swid_tag.c \
+       swid/swid_tag_id.h swid/swid_tag_id.c \
+       tcg/tcg_attr.h tcg/tcg_attr.c \
+       tcg/pts/tcg_pts_attr_proto_caps.h tcg/pts/tcg_pts_attr_proto_caps.c \
+       tcg/pts/tcg_pts_attr_dh_nonce_params_req.h tcg/pts/tcg_pts_attr_dh_nonce_params_req.c \
+       tcg/pts/tcg_pts_attr_dh_nonce_params_resp.h tcg/pts/tcg_pts_attr_dh_nonce_params_resp.c \
+       tcg/pts/tcg_pts_attr_dh_nonce_finish.h tcg/pts/tcg_pts_attr_dh_nonce_finish.c \
+       tcg/pts/tcg_pts_attr_meas_algo.h tcg/pts/tcg_pts_attr_meas_algo.c \
+       tcg/pts/tcg_pts_attr_get_tpm_version_info.h tcg/pts/tcg_pts_attr_get_tpm_version_info.c \
+       tcg/pts/tcg_pts_attr_tpm_version_info.h tcg/pts/tcg_pts_attr_tpm_version_info.c \
+       tcg/pts/tcg_pts_attr_get_aik.h tcg/pts/tcg_pts_attr_get_aik.c \
+       tcg/pts/tcg_pts_attr_aik.h tcg/pts/tcg_pts_attr_aik.c \
+       tcg/pts/tcg_pts_attr_req_func_comp_evid.h tcg/pts/tcg_pts_attr_req_func_comp_evid.c \
+       tcg/pts/tcg_pts_attr_gen_attest_evid.h tcg/pts/tcg_pts_attr_gen_attest_evid.c \
+       tcg/pts/tcg_pts_attr_simple_comp_evid.h tcg/pts/tcg_pts_attr_simple_comp_evid.c \
+       tcg/pts/tcg_pts_attr_simple_evid_final.h tcg/pts/tcg_pts_attr_simple_evid_final.c \
+       tcg/pts/tcg_pts_attr_req_file_meas.h tcg/pts/tcg_pts_attr_req_file_meas.c \
+       tcg/pts/tcg_pts_attr_file_meas.h tcg/pts/tcg_pts_attr_file_meas.c \
+       tcg/pts/tcg_pts_attr_req_file_meta.h tcg/pts/tcg_pts_attr_req_file_meta.c \
+       tcg/pts/tcg_pts_attr_unix_file_meta.h tcg/pts/tcg_pts_attr_unix_file_meta.c \
+       tcg/seg/tcg_seg_attr_max_size.h tcg/seg/tcg_seg_attr_max_size.c \
+       tcg/seg/tcg_seg_attr_seg_env.h tcg/seg/tcg_seg_attr_seg_env.c \
+       tcg/seg/tcg_seg_attr_next_seg.h tcg/seg/tcg_seg_attr_next_seg.c \
+       tcg/swid/tcg_swid_attr_req.h tcg/swid/tcg_swid_attr_req.c \
+       tcg/swid/tcg_swid_attr_tag_id_inv.h tcg/swid/tcg_swid_attr_tag_id_inv.c \
+       tcg/swid/tcg_swid_attr_tag_inv.h tcg/swid/tcg_swid_attr_tag_inv.c
 
 ipsec_SCRIPTS = imv/_imv_policy
 EXTRA_DIST = imv/_imv_policy Android.mk
@@ -99,3 +155,19 @@ endif
 if USE_IMV_OS
   SUBDIRS += plugins/imv_os
 endif
+
+if USE_IMC_ATTESTATION
+  SUBDIRS += plugins/imc_attestation
+endif
+
+if USE_IMV_ATTESTATION
+  SUBDIRS += plugins/imv_attestation
+endif
+
+if USE_IMC_SWID
+  SUBDIRS += plugins/imc_swid
+endif
+
+if USE_IMV_SWID
+  SUBDIRS += plugins/imv_swid
+endif
index ce628e4feb6eb46deeb2e80e3cc6a6dea07f9468..810a92a93c37823c3f3d340565f09e639034e494 100644 (file)
 #include "ietf/ietf_attr.h"
 #include "ietf/ietf_attr_assess_result.h"
 #include "ietf/ietf_attr_remediation_instr.h"
+#include "tcg/seg/tcg_seg_attr_max_size.h"
+#include "tcg/seg/tcg_seg_attr_seg_env.h"
+#include "tcg/seg/tcg_seg_attr_next_seg.h"
 
 #include <tncif_names.h>
 #include <tncif_pa_subtypes.h>
 
-#include <tcg/seg/tcg_seg_attr_max_size.h>
-#include <tcg/seg/tcg_seg_attr_seg_env.h>
-#include <tcg/seg/tcg_seg_attr_next_seg.h>
-
 #include <pen/pen.h>
 #include <collections/linked_list.h>
 #include <utils/debug.h>
index 30679a33de245f01d673ddfec1062d6ebc0d4485..703da23066868038082d7e081f50d6636624d8d5 100644 (file)
 #include "imcv.h"
 #include "ietf/ietf_attr.h"
 #include "ita/ita_attr.h"
+#include "tcg/tcg_attr.h"
+#include "pts/components/pts_component.h"
+#include "pts/components/pts_component_manager.h"
+#include "pts/components/tcg/tcg_comp_func_name.h"
+#include "pts/components/ita/ita_comp_func_name.h"
+#include "pts/components/ita/ita_comp_ima.h"
+#include "pts/components/ita/ita_comp_tboot.h"
+#include "pts/components/ita/ita_comp_tgrub.h"
 
 #include <utils/debug.h>
 #include <utils/utils.h>
@@ -43,6 +51,11 @@ imv_session_manager_t *imcv_sessions;
  */
 imv_database_t *imcv_db;
 
+/**
+ * PTS Functional Component manager
+ */
+pts_component_manager_t *imcv_pts_components;
+
 /**
  * Reference count for libimcv
  */
@@ -162,7 +175,26 @@ bool libimcv_init(bool is_imv)
                                                        ietf_attr_create_from_data, ietf_attr_names);
                imcv_pa_tnc_attributes->add_vendor(imcv_pa_tnc_attributes, PEN_ITA,
                                                        ita_attr_create_from_data, ita_attr_names);
-
+               imcv_pa_tnc_attributes->add_vendor(imcv_pa_tnc_attributes, PEN_TCG,
+                                                       tcg_attr_create_from_data, tcg_attr_names);
+
+               imcv_pts_components = pts_component_manager_create();
+               imcv_pts_components->add_vendor(imcv_pts_components, PEN_TCG,
+                                       pts_tcg_comp_func_names, PTS_TCG_QUALIFIER_TYPE_SIZE,
+                                       pts_tcg_qualifier_flag_names, pts_tcg_qualifier_type_names);
+               imcv_pts_components->add_vendor(imcv_pts_components, PEN_ITA,
+                                       pts_ita_comp_func_names, PTS_ITA_QUALIFIER_TYPE_SIZE,
+                                       pts_ita_qualifier_flag_names, pts_ita_qualifier_type_names);
+
+               imcv_pts_components->add_component(imcv_pts_components, PEN_ITA,
+                                                                         PTS_ITA_COMP_FUNC_NAME_TGRUB,
+                                                                         pts_ita_comp_tgrub_create);
+               imcv_pts_components->add_component(imcv_pts_components, PEN_ITA,
+                                                                         PTS_ITA_COMP_FUNC_NAME_TBOOT,
+                                                                         pts_ita_comp_tboot_create);
+               imcv_pts_components->add_component(imcv_pts_components, PEN_ITA,
+                                                                         PTS_ITA_COMP_FUNC_NAME_IMA,
+                                                                         pts_ita_comp_ima_create);
                if (is_imv)
                {
                        /* instantiate global IMV session manager */
@@ -193,8 +225,13 @@ void libimcv_deinit(void)
 {
        if (ref_put(&libimcv_ref))
        {
+               imcv_pts_components->remove_vendor(imcv_pts_components, PEN_TCG);
+               imcv_pts_components->remove_vendor(imcv_pts_components, PEN_ITA);
+               imcv_pts_components->destroy(imcv_pts_components);
+
                imcv_pa_tnc_attributes->remove_vendor(imcv_pa_tnc_attributes, PEN_IETF);
                imcv_pa_tnc_attributes->remove_vendor(imcv_pa_tnc_attributes, PEN_ITA);
+               imcv_pa_tnc_attributes->remove_vendor(imcv_pa_tnc_attributes, PEN_TCG);
                DESTROY_IF(imcv_pa_tnc_attributes);
                imcv_pa_tnc_attributes = NULL;
                DESTROY_IF(imcv_db);
index 77103880363e2cbbcdff5934f5950db86bce4612..cfb1903d9b8a6fa19a7e8d3145e8c1c20514afbf 100644 (file)
@@ -37,6 +37,7 @@
 #include "pa_tnc/pa_tnc_attr_manager.h"
 #include "imv/imv_database.h"
 #include "imv/imv_session_manager.h"
+#include "pts/components/pts_component_manager.h"
 
 #include <library.h>
 
@@ -68,4 +69,9 @@ extern imv_database_t* imcv_db;
  */
 extern imv_session_manager_t* imcv_sessions;
 
+/**
+ * PTS Functional Component manager
+ */
+extern pts_component_manager_t* imcv_pts_components;
+
 #endif /** IMCV_H_ @}*/
index d5f86ba88a24e741f46e58f0159b9db9b63abf6d..6c4b998a20b4c9bdefa459bcf7dd1ffe9fe6cc1d 100644 (file)
 #include "ietf/ietf_attr.h"
 #include "ietf/ietf_attr_assess_result.h"
 #include "ietf/ietf_attr_remediation_instr.h"
+#include "tcg/seg/tcg_seg_attr_max_size.h"
+#include "tcg/seg/tcg_seg_attr_seg_env.h"
+#include "tcg/seg/tcg_seg_attr_next_seg.h"
 
 #include <tncif_names.h>
 #include <tncif_pa_subtypes.h>
 
-#include <tcg/seg/tcg_seg_attr_max_size.h>
-#include <tcg/seg/tcg_seg_attr_seg_env.h>
-#include <tcg/seg/tcg_seg_attr_next_seg.h>
-
 #include <pen/pen.h>
 #include <collections/linked_list.h>
 #include <utils/debug.h>
similarity index 74%
rename from src/libpts/plugins/imc_attestation/Makefile.am
rename to src/libimcv/plugins/imc_attestation/Makefile.am
index 88d9ddd8b2eda585be8477673ef2824c5ef305da..e7b1f1ce13c43c7b2e56c50f545663889ce66ede 100644 (file)
@@ -1,8 +1,7 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libtncif \
-       -I$(top_srcdir)/src/libimcv \
-       -I$(top_srcdir)/src/libpts
+       -I$(top_srcdir)/src/libimcv
 
 AM_CFLAGS = \
        $(PLUGIN_CFLAGS)
@@ -10,8 +9,7 @@ AM_CFLAGS = \
 imcv_LTLIBRARIES = imc-attestation.la
 
 imc_attestation_la_LIBADD = $(top_builddir)/src/libimcv/libimcv.la \
-       $(top_builddir)/src/libstrongswan/libstrongswan.la \
-       $(top_builddir)/src/libpts/libpts.la
+       $(top_builddir)/src/libstrongswan/libstrongswan.la
 
 imc_attestation_la_SOURCES = imc_attestation.c \
        imc_attestation_state.h imc_attestation_state.c \
similarity index 98%
rename from src/libpts/plugins/imc_attestation/imc_attestation.c
rename to src/libimcv/plugins/imc_attestation/imc_attestation.c
index f7652f3a319f8d5df96fb776ed4df122334f7c75..0dd88b6a7696bd999af92d4ea8d77591ecbd80f0 100644 (file)
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2011-2012 Sansar Choinyambuu, Andreas Steffen
+ * Copyright (C) 2011-2012 Sansar Choinyambuu
+ * Copyright (C) 2011-2014 Andreas Steffen
  * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
 #include <ietf/ietf_attr_product_info.h>
 #include <ietf/ietf_attr_string_version.h>
 #include <ietf/ietf_attr_assess_result.h>
-#include <os_info/os_info.h>
-
-#include <libpts.h>
-
-#include <pts/pts_error.h>
-
 #include <tcg/pts/tcg_pts_attr_proto_caps.h>
 #include <tcg/pts/tcg_pts_attr_meas_algo.h>
+#include <os_info/os_info.h>
+#include <pts/pts_error.h>
 
 #include <tncif_pa_subtypes.h>
 
@@ -90,7 +87,6 @@ TNC_Result TNC_IMC_API TNC_IMC_Initialize(TNC_IMCID imc_id,
                imc_attestation = NULL;
                return TNC_RESULT_FATAL;
        }
-       libpts_init();
 
        if (min_version > TNC_IFIMC_VERSION_1 || max_version < TNC_IFIMC_VERSION_1)
        {
@@ -318,9 +314,6 @@ TNC_Result TNC_IMC_API TNC_IMC_Terminate(TNC_IMCID imc_id)
                DBG1(DBG_IMC, "IMC \"%s\" has not been initialized", imc_name);
                return TNC_RESULT_NOT_INITIALIZED;
        }
-
-       libpts_deinit();
-
        imc_attestation->destroy(imc_attestation);
        imc_attestation = NULL;
 
similarity index 98%
rename from src/libpts/plugins/imc_attestation/imc_attestation_state.c
rename to src/libimcv/plugins/imc_attestation/imc_attestation_state.c
index ea6742f6ae8de9e56dacfead85d6250ceb39832e..0b594cb1079fd4742d75b8989c9445568e1ec839 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "imc_attestation_state.h"
 
-#include <libpts.h>
+#include <imcv.h>
 
 #include <tncif_names.h>
 
@@ -194,7 +194,8 @@ METHOD(imc_attestation_state_t, create_component, pts_component_t*,
 
        if (!found)
        {
-               component = pts_components->create(pts_components, name, depth, NULL);
+               component = imcv_pts_components->create(imcv_pts_components,
+                                                                                               name, depth, NULL);
                if (!component)
                {
                        return NULL;
similarity index 98%
rename from src/libpts/plugins/imc_attestation/imc_attestation_state.h
rename to src/libimcv/plugins/imc_attestation/imc_attestation_state.h
index 4b93931c344de5af3dcbbecd9d74e1a8df875fd2..854c8825b5b57fce7f36af9a660eaa1a8571373b 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup imc_attestation imc_attestation
- * @ingroup libpts_plugins
+ * @ingroup libimcv_plugins
  *
  * @defgroup imc_attestation_state_t imc_attestation_state
  * @{ @ingroup imc_attestation
similarity index 94%
rename from src/libpts/plugins/imc_swid/Makefile.am
rename to src/libimcv/plugins/imc_swid/Makefile.am
index ddf596465ab82b5000584fa4de65f2feeddb82d4..c1cdb988a71a2d53b2a03fc1015d21f286e2e11a 100644 (file)
@@ -21,7 +21,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libtncif \
        -I$(top_srcdir)/src/libimcv \
-       -I$(top_srcdir)/src/libpts \
        -DSWID_DIRECTORY=\"${prefix}/share\"
 
 AM_CFLAGS = \
@@ -31,7 +30,6 @@ imcv_LTLIBRARIES = imc-swid.la
 
 imc_swid_la_LIBADD = \
        $(top_builddir)/src/libimcv/libimcv.la \
-       $(top_builddir)/src/libpts/libpts.la \
        $(top_builddir)/src/libstrongswan/libstrongswan.la
 
 imc_swid_la_SOURCES = imc_swid.c imc_swid_state.h imc_swid_state.c
similarity index 99%
rename from src/libpts/plugins/imc_swid/imc_swid.c
rename to src/libimcv/plugins/imc_swid/imc_swid.c
index 3763731a0f59b8eb7d78059fc2bcb0550de90846..86e2693d5472101323b611438415a6e50c71f413 100644 (file)
 
 #include "imc_swid_state.h"
 
-#include "libpts.h"
-#include "swid/swid_inventory.h"
-#include "swid/swid_error.h"
-#include "tcg/swid/tcg_swid_attr_req.h"
-#include "tcg/swid/tcg_swid_attr_tag_inv.h"
-#include "tcg/swid/tcg_swid_attr_tag_id_inv.h"
-
 #include <imc/imc_agent.h>
 #include <imc/imc_msg.h>
 #include <ita/ita_attr.h>
 #include <ita/ita_attr_angel.h>
+#include "tcg/swid/tcg_swid_attr_req.h"
+#include "tcg/swid/tcg_swid_attr_tag_inv.h"
+#include "tcg/swid/tcg_swid_attr_tag_id_inv.h"
+#include "swid/swid_inventory.h"
+#include "swid/swid_error.h"
 
 #include <tncif_pa_subtypes.h>
 
@@ -63,9 +61,6 @@ TNC_Result TNC_IMC_Initialize(TNC_IMCID imc_id,
        {
                return TNC_RESULT_FATAL;
        }
-
-       libpts_init();
-
        if (min_version > TNC_IFIMC_VERSION_1 || max_version < TNC_IFIMC_VERSION_1)
        {
                DBG1(DBG_IMC, "no common IF-IMC version");
@@ -431,9 +426,6 @@ TNC_Result TNC_IMC_Terminate(TNC_IMCID imc_id)
                DBG1(DBG_IMC, "IMC \"%s\" has not been initialized", imc_name);
                return TNC_RESULT_NOT_INITIALIZED;
        }
-
-       libpts_deinit();
-
        imc_swid->destroy(imc_swid);
        imc_swid = NULL;
 
similarity index 84%
rename from src/libpts/plugins/imv_attestation/Makefile.am
rename to src/libimcv/plugins/imv_attestation/Makefile.am
index 8dc74fd5411d5df44f19a02a1575f6c1825e9168..6c5bf891387fade676f567afb922d53a2c19255f 100644 (file)
@@ -2,7 +2,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libtncif \
        -I$(top_srcdir)/src/libimcv \
-       -I$(top_srcdir)/src/libpts \
        -DPLUGINS=\""${attest_plugins}\""
 
 AM_CFLAGS = \
@@ -12,8 +11,7 @@ imcv_LTLIBRARIES = imv-attestation.la
 
 imv_attestation_la_LIBADD = \
        $(top_builddir)/src/libimcv/libimcv.la \
-       $(top_builddir)/src/libstrongswan/libstrongswan.la \
-       $(top_builddir)/src/libpts/libpts.la
+       $(top_builddir)/src/libstrongswan/libstrongswan.la
 
 imv_attestation_la_SOURCES = imv_attestation.c \
        imv_attestation_state.h imv_attestation_state.c \
@@ -29,7 +27,6 @@ attest_SOURCES = attest.c \
        attest_db.h attest_db.c
 attest_LDADD = \
        $(top_builddir)/src/libimcv/libimcv.la \
-       $(top_builddir)/src/libpts/libpts.la \
        $(top_builddir)/src/libstrongswan/libstrongswan.la
 attest.o :     $(top_builddir)/config.status
 
similarity index 99%
rename from src/libpts/plugins/imv_attestation/attest.c
rename to src/libimcv/plugins/imv_attestation/attest.c
index 63c0023a7127f1ce21189ee9eeee8ef76a39a0d2..1143a0356b6753aaabf2a574ff2b2fe900940bf2 100644 (file)
@@ -28,7 +28,6 @@
 #include <utils/debug.h>
 
 #include <imcv.h>
-#include <libpts.h>
 #include <pts/pts_meas_algo.h>
 
 #include "attest_db.h"
@@ -96,7 +95,6 @@ attest_db_t *attest;
 static void cleanup(void)
 {
        attest->destroy(attest);
-       libpts_deinit();
        libimcv_deinit();
 #ifdef HAVE_SYSLOG
        closelog();
@@ -479,7 +477,6 @@ int main(int argc, char *argv[])
        }
        atexit(cleanup);
        libimcv_init(FALSE);
-       libpts_init();
 
        do_args(argc, argv);
 
similarity index 99%
rename from src/libpts/plugins/imv_attestation/attest_db.c
rename to src/libimcv/plugins/imv_attestation/attest_db.c
index d7f45ad29124bb664d09b322de887d70ba1c1c08..f85a02b3dbfe5d62352004b67733e9fd7e120637 100644 (file)
@@ -23,7 +23,7 @@
 
 #include "attest_db.h"
 
-#include "libpts.h"
+#include "imcv.h"
 #include "pts/pts_meas_algo.h"
 #include "pts/pts_file_meas.h"
 #include "pts/components/pts_comp_func_name.h"
@@ -187,9 +187,10 @@ char* print_cfn(pts_comp_func_name_t *cfn)
        qualifier = cfn->get_qualifier(cfn);
        n = snprintf(buf, BUF_LEN, "0x%06x/0x%08x-0x%02x", vid, name, qualifier);
 
-       names = pts_components->get_comp_func_names(pts_components, vid);
-       types = pts_components->get_qualifier_type_names(pts_components, vid);
-       type =  pts_components->get_qualifier(pts_components, cfn, flags);
+       names = imcv_pts_components->get_comp_func_names(imcv_pts_components, vid);
+       types = imcv_pts_components->get_qualifier_type_names(imcv_pts_components,
+                                                                                                                 vid);
+       type =  imcv_pts_components->get_qualifier(imcv_pts_components, cfn, flags);
        if (names && types)
        {
                n = snprintf(buf + n, BUF_LEN - n, " %N/%N [%s] %N",
similarity index 99%
rename from src/libpts/plugins/imv_attestation/imv_attestation_agent.c
rename to src/libimcv/plugins/imv_attestation/imv_attestation_agent.c
index ead3cc8e4840a73aad514f49335e41b5351ac0d4..c265e853cb02789924dc295dfe665a2837fea892 100644 (file)
 #include <ietf/ietf_attr_string_version.h>
 #include <ita/ita_attr.h>
 #include <ita/ita_attr_device_id.h>
-
-#include <libpts.h>
-
-#include <pts/pts.h>
-#include <pts/pts_database.h>
-#include <pts/pts_creds.h>
-#include <pts/components/ita/ita_comp_func_name.h>
-
 #include <tcg/tcg_attr.h>
 #include <tcg/pts/tcg_pts_attr_meas_algo.h>
 #include <tcg/pts/tcg_pts_attr_proto_caps.h>
 #include <tcg/pts/tcg_pts_attr_req_file_meas.h>
 #include <tcg/pts/tcg_pts_attr_req_file_meta.h>
+#include <pts/pts.h>
+#include <pts/pts_database.h>
+#include <pts/pts_creds.h>
+#include <pts/components/ita/ita_comp_func_name.h>
 
 #include <tncif_pa_subtypes.h>
 
@@ -842,7 +838,6 @@ METHOD(imv_agent_if_t, destroy, void,
        DESTROY_IF(this->pts_credmgr);
        DESTROY_IF(this->agent);
        free(this);
-       libpts_deinit();
 }
 
 /**
@@ -890,8 +885,6 @@ imv_agent_if_t *imv_attestation_agent_create(const char *name, TNC_IMVID id,
                .pts_db = pts_database_create(imcv_db),
        );
 
-       libpts_init();
-
        if (!pts_meas_algo_probe(&this->supported_algorithms) ||
                !pts_dh_group_probe(&this->supported_dh_groups, mandatory_dh_groups) ||
                !pts_meas_algo_update(hash_alg, &this->supported_algorithms) ||
similarity index 99%
rename from src/libpts/plugins/imv_attestation/imv_attestation_state.c
rename to src/libimcv/plugins/imv_attestation/imv_attestation_state.c
index feccb6d28f38e00ff77f322ed8fb830d7755980c..1c3b91aebc1a180d7108f2a24a35efafb61b142b 100644 (file)
@@ -16,8 +16,7 @@
 
 #include "imv_attestation_state.h"
 
-#include <libpts.h>
-
+#include <imcv.h>
 #include <imv/imv_lang_string.h>
 #include "imv/imv_reason_string.h"
 
@@ -404,7 +403,8 @@ METHOD(imv_attestation_state_t, create_component, pts_component_t*,
        }
        else
        {
-               component = pts_components->create(pts_components, name, depth, pts_db);
+               component = imcv_pts_components->create(imcv_pts_components,
+                                                                                               name, depth, pts_db);
                if (!component)
                {
                        /* unsupported component */
similarity index 99%
rename from src/libpts/plugins/imv_attestation/imv_attestation_state.h
rename to src/libimcv/plugins/imv_attestation/imv_attestation_state.h
index b72857552265c92e288328efd943d4d400fee9a7..5e6fae2ca9fc30113c87b6e1dfb9d44a8864fc44 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup imv_attestation imv_attestation
- * @ingroup libpts_plugins
+ * @ingroup libimcv_plugins
  *
  * @defgroup imv_attestation_state_t imv_attestation_state
  * @{ @ingroup imv_attestation
similarity index 83%
rename from src/libpts/plugins/imv_swid/Makefile.am
rename to src/libimcv/plugins/imv_swid/Makefile.am
index 9305484c2d578a56027aba0cda20ad1b4d04f284..3a63b67d2a64a92e48d0cf13eb0548fd54bab663 100644 (file)
@@ -1,8 +1,7 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libtncif \
-       -I$(top_srcdir)/src/libimcv \
-       -I$(top_srcdir)/src/libpts
+       -I$(top_srcdir)/src/libimcv
 
 AM_CFLAGS = \
        $(PLUGIN_CFLAGS) $(json_CFLAGS)
@@ -11,7 +10,6 @@ imcv_LTLIBRARIES = imv-swid.la
 
 imv_swid_la_LIBADD = \
        $(top_builddir)/src/libimcv/libimcv.la \
-       $(top_builddir)/src/libpts/libpts.la \
        $(top_builddir)/src/libstrongswan/libstrongswan.la \
        $(json_LIBS)
 
similarity index 99%
rename from src/libpts/plugins/imv_swid/imv_swid_agent.c
rename to src/libimcv/plugins/imv_swid/imv_swid_agent.c
index 71c601c842c0572afb50325a65b4160b8d2dea01..724611de8ce0dfda22466a631a62b85878fb318c 100644 (file)
 #include "imv_swid_state.h"
 #include "imv_swid_rest.h"
 
-#include "libpts.h"
-#include "swid/swid_error.h"
-#include "swid/swid_inventory.h"
-#include "tcg/seg/tcg_seg_attr_max_size.h"
-#include "tcg/seg/tcg_seg_attr_seg_env.h"
-#include "tcg/swid/tcg_swid_attr_req.h"
-#include "tcg/swid/tcg_swid_attr_tag_inv.h"
-#include "tcg/swid/tcg_swid_attr_tag_id_inv.h"
-
 #include <imcv.h>
-#include <ietf/ietf_attr_pa_tnc_error.h>
 #include <imv/imv_agent.h>
 #include <imv/imv_msg.h>
+#include <ietf/ietf_attr_pa_tnc_error.h>
 #include <ita/ita_attr.h>
 #include <ita/ita_attr_angel.h>
+#include "tcg/seg/tcg_seg_attr_max_size.h"
+#include "tcg/seg/tcg_seg_attr_seg_env.h"
+#include "tcg/swid/tcg_swid_attr_req.h"
+#include "tcg/swid/tcg_swid_attr_tag_inv.h"
+#include "tcg/swid/tcg_swid_attr_tag_id_inv.h"
+#include "swid/swid_error.h"
+#include "swid/swid_inventory.h"
 
 #include <tncif_names.h>
 #include <tncif_pa_subtypes.h>
@@ -704,7 +702,6 @@ METHOD(imv_agent_if_t, destroy, void,
        DESTROY_IF(this->rest_api);
        this->agent->destroy(this->agent);
        free(this);
-       libpts_deinit();
 }
 
 /**
@@ -748,7 +745,6 @@ imv_agent_if_t *imv_swid_agent_create(const char *name, TNC_IMVID id,
        {
                this->rest_api = imv_swid_rest_create(rest_api_uri, rest_api_timeout);
        }
-       libpts_init();
 
        return &this->public;
 }
similarity index 99%
rename from src/libpts/pts/components/ita/ita_comp_ima.c
rename to src/libimcv/pts/components/ita/ita_comp_ima.c
index be8aa40adb3afcb0cddcfd79832c1755fd86360b..3f92b04b1f484d994192cc9cf9e4425326af26f4 100644 (file)
@@ -16,7 +16,7 @@
 #include "ita_comp_ima.h"
 #include "ita_comp_func_name.h"
 
-#include "libpts.h"
+#include "imcv.h"
 #include "pts/pts_pcr.h"
 #include "pts/pts_ima_bios_list.h"
 #include "pts/pts_ima_event_list.h"
similarity index 97%
rename from src/libpts/pts/components/ita/ita_comp_tboot.c
rename to src/libimcv/pts/components/ita/ita_comp_tboot.c
index 67be1ca3aca617046ff14816bbe1c11dbeb2cfe3..273c18f31c1fb9251519c8efc9fcba7dee7eaa03 100644 (file)
@@ -16,7 +16,7 @@
 #include "ita_comp_tboot.h"
 #include "ita_comp_func_name.h"
 
-#include "libpts.h"
+#include "imcv.h"
 #include "pts/components/pts_component.h"
 
 #include <utils/debug.h>
@@ -215,7 +215,7 @@ METHOD(pts_component_t, verify, status_t,
        }
        vid = this->name->get_vendor_id(this->name);
        name = this->name->get_name(this->name);
-       names = pts_components->get_comp_func_names(pts_components, vid);
+       names = imcv_pts_components->get_comp_func_names(imcv_pts_components, vid);
 
        if (this->count)
        {
@@ -320,7 +320,8 @@ METHOD(pts_component_t, destroy, void,
                                                                                                this->cid, this->aik_id);
                        vid = this->name->get_vendor_id(this->name);
                        name = this->name->get_name(this->name);
-                       names = pts_components->get_comp_func_names(pts_components, vid);
+                       names = imcv_pts_components->get_comp_func_names(imcv_pts_components,
+                                                                                               vid);
                        DBG1(DBG_PTS, "deleted %d registered %N '%N' functional component "
                                 "evidence measurements", count, pen_names, vid, names, name);
                }
similarity index 90%
rename from src/libpts/pts/components/pts_comp_func_name.c
rename to src/libimcv/pts/components/pts_comp_func_name.c
index 6c630f8fb39b4ab7f773ff45e8af1095802df856..e12522ed1ee24d42a661f72126fbedccae404173 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2012 Andreas Steffen
+ * Copyright (C) 2011-2014 Andreas Steffen
  *
  * HSR Hochschule fuer Technik Rapperswil
  *
@@ -14,7 +14,7 @@
  * for more details.
  */
 
-#include "libpts.h"
+#include "imcv.h"
 #include "pts/components/pts_comp_func_name.h"
 
 #include <utils/debug.h>
@@ -108,9 +108,12 @@ METHOD(pts_comp_func_name_t, log_, void,
        char flags[8];
        int type;
 
-       names = pts_components->get_comp_func_names(pts_components, this->vid);
-       types = pts_components->get_qualifier_type_names(pts_components, this->vid);
-       type =  pts_components->get_qualifier(pts_components, &this->public, flags);
+       names = imcv_pts_components->get_comp_func_names(imcv_pts_components,
+                                                                                       this->vid);
+       types = imcv_pts_components->get_qualifier_type_names(imcv_pts_components,
+                                                                                       this->vid);
+       type =  imcv_pts_components->get_qualifier(imcv_pts_components,
+                                                                                       &this->public, flags);
 
        if (names && types)
        {
similarity index 100%
rename from src/libpts/pts/pts.c
rename to src/libimcv/pts/pts.c
similarity index 100%
rename from src/libpts/pts/pts.h
rename to src/libimcv/pts/pts.h
index 589d6d1cdee26d7f8b8f47df7e13cf9b9b1db5ca..38e954d9557be215bb647e53bdc1baeee262ef2e 100644 (file)
 
 #include "seg_contract.h"
 #include "seg_env.h"
+#include "tcg/seg/tcg_seg_attr_seg_env.h"
 
 #include <utils/debug.h>
 #include <bio/bio_writer.h>
 
 #include <tncif_pa_subtypes.h>
 
-#include <tcg/seg/tcg_seg_attr_seg_env.h>
-
 typedef struct private_seg_contract_t private_seg_contract_t;
 
 /**
index 1f4cfc53feb6db1ff31b8bc21d3137dd25290adb..1ec8a367b443b20702ac6b8c9a96b0467912e616 100644 (file)
 
 #include "imcv.h"
 #include "pa_tnc/pa_tnc_msg.h"
+#include "tcg/seg/tcg_seg_attr_seg_env.h"
 
 #include <utils/debug.h>
 #include <bio/bio_reader.h>
 #include <bio/bio_writer.h>
 
-#include <tcg/seg/tcg_seg_attr_seg_env.h>
-
 #define BASE_ATTR_ID_PREFIX    0xFF
 
 typedef struct private_seg_env_t private_seg_env_t;
diff --git a/src/libpts/Android.mk b/src/libpts/Android.mk
deleted file mode 100644 (file)
index ce328c5..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# copy-n-paste from Makefile.am
-libpts_la_SOURCES := \
-       libpts.h libpts.c \
-       pts/pts.h pts/pts.c \
-       pts/pts_error.h pts/pts_error.c \
-       pts/pts_pcr.h pts/pts_pcr.c \
-       pts/pts_proto_caps.h \
-       pts/pts_req_func_comp_evid.h \
-       pts/pts_simple_evid_final.h \
-       pts/pts_creds.h pts/pts_creds.c \
-       pts/pts_database.h pts/pts_database.c \
-       pts/pts_dh_group.h pts/pts_dh_group.c \
-       pts/pts_file_meas.h pts/pts_file_meas.c \
-       pts/pts_file_meta.h pts/pts_file_meta.c \
-       pts/pts_file_type.h pts/pts_file_type.c \
-       pts/pts_ima_bios_list.h pts/pts_ima_bios_list.c \
-       pts/pts_ima_event_list.h pts/pts_ima_event_list.c \
-       pts/pts_meas_algo.h pts/pts_meas_algo.c \
-       pts/components/pts_component.h \
-       pts/components/pts_component_manager.h pts/components/pts_component_manager.c \
-       pts/components/pts_comp_evidence.h pts/components/pts_comp_evidence.c \
-       pts/components/pts_comp_func_name.h pts/components/pts_comp_func_name.c \
-       pts/components/ita/ita_comp_func_name.h pts/components/ita/ita_comp_func_name.c \
-       pts/components/ita/ita_comp_ima.h pts/components/ita/ita_comp_ima.c \
-       pts/components/ita/ita_comp_tboot.h pts/components/ita/ita_comp_tboot.c \
-       pts/components/ita/ita_comp_tgrub.h pts/components/ita/ita_comp_tgrub.c \
-       pts/components/tcg/tcg_comp_func_name.h pts/components/tcg/tcg_comp_func_name.c \
-       swid/swid_error.h swid/swid_error.c \
-       swid/swid_inventory.h swid/swid_inventory.c \
-       swid/swid_tag.h swid/swid_tag.c \
-       swid/swid_tag_id.h swid/swid_tag_id.c \
-       tcg/tcg_attr.h tcg/tcg_attr.c \
-       tcg/pts/tcg_pts_attr_proto_caps.h tcg/pts/tcg_pts_attr_proto_caps.c \
-       tcg/pts/tcg_pts_attr_dh_nonce_params_req.h tcg/pts/tcg_pts_attr_dh_nonce_params_req.c \
-       tcg/pts/tcg_pts_attr_dh_nonce_params_resp.h tcg/pts/tcg_pts_attr_dh_nonce_params_resp.c \
-       tcg/pts/tcg_pts_attr_dh_nonce_finish.h tcg/pts/tcg_pts_attr_dh_nonce_finish.c \
-       tcg/pts/tcg_pts_attr_meas_algo.h tcg/pts/tcg_pts_attr_meas_algo.c \
-       tcg/pts/tcg_pts_attr_get_tpm_version_info.h tcg/pts/tcg_pts_attr_get_tpm_version_info.c \
-       tcg/pts/tcg_pts_attr_tpm_version_info.h tcg/pts/tcg_pts_attr_tpm_version_info.c \
-       tcg/pts/tcg_pts_attr_get_aik.h tcg/pts/tcg_pts_attr_get_aik.c \
-       tcg/pts/tcg_pts_attr_aik.h tcg/pts/tcg_pts_attr_aik.c \
-       tcg/pts/tcg_pts_attr_req_func_comp_evid.h tcg/pts/tcg_pts_attr_req_func_comp_evid.c \
-       tcg/pts/tcg_pts_attr_gen_attest_evid.h tcg/pts/tcg_pts_attr_gen_attest_evid.c \
-       tcg/pts/tcg_pts_attr_simple_comp_evid.h tcg/pts/tcg_pts_attr_simple_comp_evid.c \
-       tcg/pts/tcg_pts_attr_simple_evid_final.h tcg/pts/tcg_pts_attr_simple_evid_final.c \
-       tcg/pts/tcg_pts_attr_req_file_meas.h tcg/pts/tcg_pts_attr_req_file_meas.c \
-       tcg/pts/tcg_pts_attr_file_meas.h tcg/pts/tcg_pts_attr_file_meas.c \
-       tcg/pts/tcg_pts_attr_req_file_meta.h tcg/pts/tcg_pts_attr_req_file_meta.c \
-       tcg/pts/tcg_pts_attr_unix_file_meta.h tcg/pts/tcg_pts_attr_unix_file_meta.c \
-       tcg/swid/tcg_swid_attr_req.h tcg/swid/tcg_swid_attr_req.c \
-       tcg/swid/tcg_swid_attr_tag_id_inv.h tcg/swid/tcg_swid_attr_tag_id_inv.c \
-       tcg/swid/tcg_swid_attr_tag_inv.h tcg/swid/tcg_swid_attr_tag_inv.c
-
-LOCAL_SRC_FILES := $(filter %.c,$(libpts_la_SOURCES))
-
-# build libpts -----------------------------------------------------------------
-
-LOCAL_C_INCLUDES += \
-       $(strongswan_PATH)/src/libtncif \
-       $(strongswan_PATH)/src/libimcv \
-       $(strongswan_PATH)/src/libstrongswan
-
-LOCAL_CFLAGS := $(strongswan_CFLAGS)
-
-LOCAL_MODULE := libpts
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_ARM_MODE := arm
-
-LOCAL_PRELINK_MODULE := false
-
-LOCAL_SHARED_LIBRARIES += libstrongswan libimcv
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/src/libpts/Makefile.am b/src/libpts/Makefile.am
deleted file mode 100644 (file)
index f047b52..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libtncif \
-       -I$(top_srcdir)/src/libimcv
-
-AM_LDFLAGS = \
-       -no-undefined
-
-ipseclib_LTLIBRARIES = libpts.la
-
-libpts_la_LIBADD = \
-       $(top_builddir)/src/libstrongswan/libstrongswan.la \
-       $(top_builddir)/src/libtncif/libtncif.la \
-       $(top_builddir)/src/libimcv/libimcv.la
-
-if USE_WINDOWS
-  libpts_la_LIBADD += -lws2_32
-endif
-
-if USE_TROUSERS
-  libpts_la_LIBADD += -ltspi
-endif
-
-libpts_la_SOURCES = \
-       libpts.h libpts.c \
-       pts/pts.h pts/pts.c \
-       pts/pts_error.h pts/pts_error.c \
-       pts/pts_pcr.h pts/pts_pcr.c \
-       pts/pts_proto_caps.h \
-       pts/pts_req_func_comp_evid.h \
-       pts/pts_simple_evid_final.h \
-       pts/pts_creds.h pts/pts_creds.c \
-       pts/pts_database.h pts/pts_database.c \
-       pts/pts_dh_group.h pts/pts_dh_group.c \
-       pts/pts_file_meas.h pts/pts_file_meas.c \
-       pts/pts_file_meta.h pts/pts_file_meta.c \
-       pts/pts_file_type.h pts/pts_file_type.c \
-       pts/pts_ima_bios_list.h pts/pts_ima_bios_list.c \
-       pts/pts_ima_event_list.h pts/pts_ima_event_list.c \
-       pts/pts_meas_algo.h pts/pts_meas_algo.c \
-       pts/components/pts_component.h \
-       pts/components/pts_component_manager.h pts/components/pts_component_manager.c \
-       pts/components/pts_comp_evidence.h pts/components/pts_comp_evidence.c \
-       pts/components/pts_comp_func_name.h pts/components/pts_comp_func_name.c \
-       pts/components/ita/ita_comp_func_name.h pts/components/ita/ita_comp_func_name.c \
-       pts/components/ita/ita_comp_ima.h pts/components/ita/ita_comp_ima.c \
-       pts/components/ita/ita_comp_tboot.h pts/components/ita/ita_comp_tboot.c \
-       pts/components/ita/ita_comp_tgrub.h pts/components/ita/ita_comp_tgrub.c \
-       pts/components/tcg/tcg_comp_func_name.h pts/components/tcg/tcg_comp_func_name.c \
-       swid/swid_error.h swid/swid_error.c \
-       swid/swid_inventory.h swid/swid_inventory.c \
-       swid/swid_tag.h swid/swid_tag.c \
-       swid/swid_tag_id.h swid/swid_tag_id.c \
-       tcg/tcg_attr.h tcg/tcg_attr.c \
-       tcg/pts/tcg_pts_attr_proto_caps.h tcg/pts/tcg_pts_attr_proto_caps.c \
-       tcg/pts/tcg_pts_attr_dh_nonce_params_req.h tcg/pts/tcg_pts_attr_dh_nonce_params_req.c \
-       tcg/pts/tcg_pts_attr_dh_nonce_params_resp.h tcg/pts/tcg_pts_attr_dh_nonce_params_resp.c \
-       tcg/pts/tcg_pts_attr_dh_nonce_finish.h tcg/pts/tcg_pts_attr_dh_nonce_finish.c \
-       tcg/pts/tcg_pts_attr_meas_algo.h tcg/pts/tcg_pts_attr_meas_algo.c \
-       tcg/pts/tcg_pts_attr_get_tpm_version_info.h tcg/pts/tcg_pts_attr_get_tpm_version_info.c \
-       tcg/pts/tcg_pts_attr_tpm_version_info.h tcg/pts/tcg_pts_attr_tpm_version_info.c \
-       tcg/pts/tcg_pts_attr_get_aik.h tcg/pts/tcg_pts_attr_get_aik.c \
-       tcg/pts/tcg_pts_attr_aik.h tcg/pts/tcg_pts_attr_aik.c \
-       tcg/pts/tcg_pts_attr_req_func_comp_evid.h tcg/pts/tcg_pts_attr_req_func_comp_evid.c \
-       tcg/pts/tcg_pts_attr_gen_attest_evid.h tcg/pts/tcg_pts_attr_gen_attest_evid.c \
-       tcg/pts/tcg_pts_attr_simple_comp_evid.h tcg/pts/tcg_pts_attr_simple_comp_evid.c \
-       tcg/pts/tcg_pts_attr_simple_evid_final.h tcg/pts/tcg_pts_attr_simple_evid_final.c \
-       tcg/pts/tcg_pts_attr_req_file_meas.h tcg/pts/tcg_pts_attr_req_file_meas.c \
-       tcg/pts/tcg_pts_attr_file_meas.h tcg/pts/tcg_pts_attr_file_meas.c \
-       tcg/pts/tcg_pts_attr_req_file_meta.h tcg/pts/tcg_pts_attr_req_file_meta.c \
-       tcg/pts/tcg_pts_attr_unix_file_meta.h tcg/pts/tcg_pts_attr_unix_file_meta.c \
-       tcg/seg/tcg_seg_attr_max_size.h tcg/seg/tcg_seg_attr_max_size.c \
-       tcg/seg/tcg_seg_attr_seg_env.h tcg/seg/tcg_seg_attr_seg_env.c \
-       tcg/seg/tcg_seg_attr_next_seg.h tcg/seg/tcg_seg_attr_next_seg.c \
-       tcg/swid/tcg_swid_attr_req.h tcg/swid/tcg_swid_attr_req.c \
-       tcg/swid/tcg_swid_attr_tag_id_inv.h tcg/swid/tcg_swid_attr_tag_id_inv.c \
-       tcg/swid/tcg_swid_attr_tag_inv.h tcg/swid/tcg_swid_attr_tag_inv.c
-
-EXTRA_DIST = Android.mk
-
-SUBDIRS = .
-
-if USE_IMC_ATTESTATION
-  SUBDIRS += plugins/imc_attestation
-endif
-
-if USE_IMV_ATTESTATION
-  SUBDIRS += plugins/imv_attestation
-endif
-
-if USE_IMC_SWID
-  SUBDIRS += plugins/imc_swid
-endif
-
-if USE_IMV_SWID
-  SUBDIRS += plugins/imv_swid
-endif
diff --git a/src/libpts/libpts.c b/src/libpts/libpts.c
deleted file mode 100644 (file)
index 9511082..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2011 Andreas Steffen, HSR Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#include "libpts.h"
-#include "tcg/tcg_attr.h"
-#include "pts/components/pts_component.h"
-#include "pts/components/pts_component_manager.h"
-#include "pts/components/tcg/tcg_comp_func_name.h"
-#include "pts/components/ita/ita_comp_func_name.h"
-#include "pts/components/ita/ita_comp_ima.h"
-#include "pts/components/ita/ita_comp_tboot.h"
-#include "pts/components/ita/ita_comp_tgrub.h"
-
-#include <imcv.h>
-#include <utils/debug.h>
-
-/**
- * PTS Functional Component manager
- */
-pts_component_manager_t *pts_components;
-
-/**
- * Reference count for IMC/IMV instances
- */
-static refcount_t libpts_ref = 0;
-
-/**
- * Described in header.
- */
-bool libpts_init(void)
-{
-       if (libpts_ref == 0)
-       {
-               if (!imcv_pa_tnc_attributes)
-               {
-                       return FALSE;
-               }
-               imcv_pa_tnc_attributes->add_vendor(imcv_pa_tnc_attributes, PEN_TCG,
-                                                       tcg_attr_create_from_data, tcg_attr_names);
-
-               pts_components = pts_component_manager_create();
-               pts_components->add_vendor(pts_components, PEN_TCG,
-                                       pts_tcg_comp_func_names, PTS_TCG_QUALIFIER_TYPE_SIZE,
-                                       pts_tcg_qualifier_flag_names, pts_tcg_qualifier_type_names);
-               pts_components->add_vendor(pts_components, PEN_ITA,
-                                       pts_ita_comp_func_names, PTS_ITA_QUALIFIER_TYPE_SIZE,
-                                       pts_ita_qualifier_flag_names, pts_ita_qualifier_type_names);
-
-               pts_components->add_component(pts_components, PEN_ITA,
-                                                                         PTS_ITA_COMP_FUNC_NAME_TGRUB,
-                                                                         pts_ita_comp_tgrub_create);
-               pts_components->add_component(pts_components, PEN_ITA,
-                                                                         PTS_ITA_COMP_FUNC_NAME_TBOOT,
-                                                                         pts_ita_comp_tboot_create);
-               pts_components->add_component(pts_components, PEN_ITA,
-                                                                         PTS_ITA_COMP_FUNC_NAME_IMA,
-                                                                         pts_ita_comp_ima_create);
-
-               DBG1(DBG_LIB, "libpts initialized");
-       }
-       ref_get(&libpts_ref);
-
-       return TRUE;
-}
-
-/**
- * Described in header.
- */
-void libpts_deinit(void)
-{
-       if (ref_put(&libpts_ref))
-       {
-               pts_components->remove_vendor(pts_components, PEN_TCG);
-               pts_components->remove_vendor(pts_components, PEN_ITA);
-               pts_components->destroy(pts_components);
-
-               if (!imcv_pa_tnc_attributes)
-               {
-                       return;
-               }
-               imcv_pa_tnc_attributes->remove_vendor(imcv_pa_tnc_attributes, PEN_TCG);
-               DBG1(DBG_LIB, "libpts terminated");
-       }
-}
-
diff --git a/src/libpts/libpts.h b/src/libpts/libpts.h
deleted file mode 100644 (file)
index e3814e9..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2011 Andreas Steffen, HSR Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-/**
- * @defgroup libpts libpts
- *
- * @defgroup libpts_plugins plugins
- * @ingroup libpts
- *
- * @defgroup swid swid
- * @ingroup libpts
- *
- * @addtogroup libpts
- * @{
- */
-
-#ifndef LIBPTS_H_
-#define LIBPTS_H_
-
-#include "pts/components/pts_component_manager.h"
-
-#include <library.h>
-
-/**
- * Initialize libpts.
- *
- * @return                     FALSE if initialization failed
- */
-bool libpts_init(void);
-
-/**
- * Deinitialize libpts.
- */
-void libpts_deinit(void);
-
-/**
- * PTS Functional Component manager
- */
-extern pts_component_manager_t* pts_components;
-
-#endif /** LIBPTS_H_ @}*/