Moved debug.[ch] to utils folder
authorTobias Brunner <tobias@strongswan.org>
Tue, 16 Oct 2012 14:03:21 +0000 (16:03 +0200)
committerTobias Brunner <tobias@strongswan.org>
Wed, 24 Oct 2012 14:00:51 +0000 (16:00 +0200)
308 files changed:
scripts/dh_speed.c
scripts/fetch.c
scripts/key2keyid.c
scripts/keyid2sql.c
scripts/pubkey_speed.c
scripts/tls_test.c
src/dumm/bridge.c
src/dumm/cowfs.c
src/dumm/dumm.c
src/dumm/ext/dumm.c
src/dumm/guest.c
src/dumm/iface.c
src/dumm/mconsole.c
src/frontends/android/jni/libandroidbridge/backend/android_attr.c
src/frontends/android/jni/libandroidbridge/backend/android_private_key.c
src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c
src/frontends/android/jni/libandroidbridge/kernel/android_net.c
src/frontends/android/jni/libandroidbridge/kernel/network_manager.c
src/frontends/android/jni/libandroidbridge/vpnservice_builder.c
src/libcharon/bus/bus.h
src/libcharon/plugins/addrblock/addrblock_validator.c
src/libcharon/plugins/certexpire/certexpire_cron.c
src/libcharon/plugins/certexpire/certexpire_export.c
src/libcharon/plugins/eap_peap/eap_peap_avp.c
src/libcharon/plugins/eap_peap/eap_peap_peer.c
src/libcharon/plugins/eap_peap/eap_peap_server.c
src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_provider.c
src/libcharon/plugins/eap_tnc/eap_tnc.c
src/libcharon/plugins/eap_ttls/eap_ttls_avp.c
src/libcharon/plugins/eap_ttls/eap_ttls_peer.c
src/libcharon/plugins/eap_ttls/eap_ttls_server.c
src/libcharon/plugins/tnc_ifmap/tnc_ifmap_listener.c
src/libcharon/plugins/tnc_ifmap/tnc_ifmap_soap.c
src/libcharon/plugins/tnc_imc/tnc_imc.c
src/libcharon/plugins/tnc_imc/tnc_imc_bind_function.c
src/libcharon/plugins/tnc_imc/tnc_imc_manager.c
src/libcharon/plugins/tnc_imv/tnc_imv.c
src/libcharon/plugins/tnc_imv/tnc_imv_bind_function.c
src/libcharon/plugins/tnc_imv/tnc_imv_manager.c
src/libcharon/plugins/tnc_imv/tnc_imv_recommendations.c
src/libcharon/plugins/tnc_pdp/tnc_pdp.c
src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.c
src/libcharon/plugins/tnc_tnccs/tnc_tnccs_manager.c
src/libcharon/plugins/tnc_tnccs/tnc_tnccs_plugin.c
src/libcharon/plugins/tnccs_11/batch/tnccs_batch.c
src/libcharon/plugins/tnccs_11/messages/imc_imv_msg.c
src/libcharon/plugins/tnccs_11/messages/tnccs_error_msg.c
src/libcharon/plugins/tnccs_11/messages/tnccs_msg.c
src/libcharon/plugins/tnccs_11/messages/tnccs_preferred_language_msg.c
src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.c
src/libcharon/plugins/tnccs_11/messages/tnccs_recommendation_msg.c
src/libcharon/plugins/tnccs_11/messages/tnccs_tncs_contact_info_msg.c
src/libcharon/plugins/tnccs_11/tnccs_11.c
src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.c
src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_msg.c
src/libcharon/plugins/tnccs_20/messages/pb_assessment_result_msg.c
src/libcharon/plugins/tnccs_20/messages/pb_error_msg.c
src/libcharon/plugins/tnccs_20/messages/pb_language_preference_msg.c
src/libcharon/plugins/tnccs_20/messages/pb_pa_msg.c
src/libcharon/plugins/tnccs_20/messages/pb_reason_string_msg.c
src/libcharon/plugins/tnccs_20/messages/pb_remediation_parameters_msg.c
src/libcharon/plugins/tnccs_20/state_machine/pb_tnc_state_machine.c
src/libcharon/plugins/tnccs_20/tnccs_20.c
src/libcharon/plugins/tnccs_dynamic/tnccs_dynamic.c
src/libfast/dispatcher.c
src/libfast/request.c
src/libfast/smtp.c
src/libhydra/attributes/attribute_manager.c
src/libhydra/attributes/mem_pool.c
src/libhydra/hydra.c
src/libhydra/kernel/kernel_interface.c
src/libhydra/plugins/attr/attr_provider.c
src/libhydra/plugins/attr_sql/attr_sql_plugin.c
src/libhydra/plugins/attr_sql/pool.c
src/libhydra/plugins/attr_sql/sql_attribute.c
src/libhydra/plugins/kernel_klips/kernel_klips_ipsec.c
src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c
src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c
src/libhydra/plugins/kernel_netlink/kernel_netlink_shared.c
src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c
src/libhydra/plugins/resolve/resolve_handler.c
src/libimcv/ietf/ietf_attr_assess_result.c
src/libimcv/ietf/ietf_attr_attr_request.c
src/libimcv/ietf/ietf_attr_default_pwd_enabled.c
src/libimcv/ietf/ietf_attr_fwd_enabled.c
src/libimcv/ietf/ietf_attr_installed_packages.c
src/libimcv/ietf/ietf_attr_numeric_version.c
src/libimcv/ietf/ietf_attr_op_status.c
src/libimcv/ietf/ietf_attr_pa_tnc_error.c
src/libimcv/ietf/ietf_attr_port_filter.c
src/libimcv/ietf/ietf_attr_product_info.c
src/libimcv/ietf/ietf_attr_remediation_instr.c
src/libimcv/ietf/ietf_attr_string_version.c
src/libimcv/imc/imc_agent.c
src/libimcv/imc/imc_msg.c
src/libimcv/imcv.c
src/libimcv/imv/imv_agent.c
src/libimcv/imv/imv_msg.c
src/libimcv/ita/ita_attr_command.c
src/libimcv/ita/ita_attr_dummy.c
src/libimcv/os_info/os_info.c
src/libimcv/pa_tnc/pa_tnc_attr_manager.c
src/libimcv/pa_tnc/pa_tnc_msg.c
src/libimcv/plugins/imc_os/imc_os.c
src/libimcv/plugins/imc_os/imc_os_state.c
src/libimcv/plugins/imc_scanner/imc_scanner.c
src/libimcv/plugins/imc_scanner/imc_scanner_state.c
src/libimcv/plugins/imc_test/imc_test.c
src/libimcv/plugins/imc_test/imc_test_state.c
src/libimcv/plugins/imv_os/imv_os.c
src/libimcv/plugins/imv_os/imv_os_state.c
src/libimcv/plugins/imv_scanner/imv_scanner.c
src/libimcv/plugins/imv_scanner/imv_scanner_state.c
src/libimcv/plugins/imv_test/imv_test.c
src/libimcv/plugins/imv_test/imv_test_state.c
src/libipsec/esp_context.c
src/libipsec/esp_packet.c
src/libipsec/ip_packet.c
src/libipsec/ipsec.c
src/libipsec/ipsec_event_relay.c
src/libipsec/ipsec_policy.c
src/libipsec/ipsec_policy_mgr.c
src/libipsec/ipsec_processor.c
src/libipsec/ipsec_sa.c
src/libipsec/ipsec_sa_mgr.c
src/libpts/libpts.c
src/libpts/plugins/imc_attestation/imc_attestation.c
src/libpts/plugins/imc_attestation/imc_attestation_process.c
src/libpts/plugins/imc_attestation/imc_attestation_state.c
src/libpts/plugins/imv_attestation/attest.c
src/libpts/plugins/imv_attestation/imv_attestation.c
src/libpts/plugins/imv_attestation/imv_attestation_build.c
src/libpts/plugins/imv_attestation/imv_attestation_process.c
src/libpts/plugins/imv_attestation/imv_attestation_state.c
src/libpts/pts/components/ita/ita_comp_ima.c
src/libpts/pts/components/ita/ita_comp_tboot.c
src/libpts/pts/components/ita/ita_comp_tgrub.c
src/libpts/pts/components/pts_comp_evidence.c
src/libpts/pts/components/pts_comp_func_name.c
src/libpts/pts/components/pts_component_manager.c
src/libpts/pts/pts.c
src/libpts/pts/pts_creds.c
src/libpts/pts/pts_database.c
src/libpts/pts/pts_dh_group.c
src/libpts/pts/pts_file_meas.c
src/libpts/pts/pts_file_meta.c
src/libpts/pts/pts_meas_algo.c
src/libpts/pts/pts_pcr.c
src/libpts/tcg/tcg_pts_attr_aik.c
src/libpts/tcg/tcg_pts_attr_dh_nonce_finish.c
src/libpts/tcg/tcg_pts_attr_dh_nonce_params_req.c
src/libpts/tcg/tcg_pts_attr_dh_nonce_params_resp.c
src/libpts/tcg/tcg_pts_attr_file_meas.c
src/libpts/tcg/tcg_pts_attr_gen_attest_evid.c
src/libpts/tcg/tcg_pts_attr_get_aik.c
src/libpts/tcg/tcg_pts_attr_get_tpm_version_info.c
src/libpts/tcg/tcg_pts_attr_meas_algo.c
src/libpts/tcg/tcg_pts_attr_proto_caps.c
src/libpts/tcg/tcg_pts_attr_req_file_meas.c
src/libpts/tcg/tcg_pts_attr_req_file_meta.c
src/libpts/tcg/tcg_pts_attr_req_func_comp_evid.c
src/libpts/tcg/tcg_pts_attr_simple_comp_evid.c
src/libpts/tcg/tcg_pts_attr_simple_evid_final.c
src/libpts/tcg/tcg_pts_attr_tpm_version_info.c
src/libpts/tcg/tcg_pts_attr_unix_file_meta.c
src/libradius/radius_client.c
src/libradius/radius_message.c
src/libradius/radius_socket.c
src/libsimaka/simaka_crypto.c
src/libsimaka/simaka_manager.c
src/libsimaka/simaka_message.c
src/libstrongswan/Android.mk
src/libstrongswan/Makefile.am
src/libstrongswan/asn1/asn1.c
src/libstrongswan/asn1/asn1_parser.c
src/libstrongswan/bio/bio_reader.c
src/libstrongswan/collections/enumerator.c
src/libstrongswan/credentials/auth_cfg.c
src/libstrongswan/credentials/certificates/certificate.c
src/libstrongswan/credentials/certificates/crl.c
src/libstrongswan/credentials/credential_factory.c
src/libstrongswan/credentials/credential_manager.c
src/libstrongswan/credentials/sets/auth_cfg_wrapper.c
src/libstrongswan/crypto/aead.c
src/libstrongswan/crypto/crypto_factory.c
src/libstrongswan/crypto/crypto_tester.c
src/libstrongswan/crypto/pkcs7.c
src/libstrongswan/crypto/pkcs9.c
src/libstrongswan/debug.c [deleted file]
src/libstrongswan/debug.h [deleted file]
src/libstrongswan/eap/eap.c
src/libstrongswan/fetcher/fetcher_manager.c
src/libstrongswan/library.c
src/libstrongswan/networking/host.c
src/libstrongswan/networking/host_resolver.c
src/libstrongswan/networking/tun_device.c
src/libstrongswan/plugins/af_alg/af_alg_ops.c
src/libstrongswan/plugins/agent/agent_private_key.c
src/libstrongswan/plugins/cmac/cmac.c
src/libstrongswan/plugins/constraints/constraints_validator.c
src/libstrongswan/plugins/curl/curl_fetcher.c
src/libstrongswan/plugins/curl/curl_plugin.c
src/libstrongswan/plugins/dnskey/dnskey_builder.c
src/libstrongswan/plugins/fips_prf/fips_prf.c
src/libstrongswan/plugins/gcrypt/gcrypt_crypter.c
src/libstrongswan/plugins/gcrypt/gcrypt_dh.c
src/libstrongswan/plugins/gcrypt/gcrypt_hasher.c
src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c
src/libstrongswan/plugins/gcrypt/gcrypt_rsa_private_key.c
src/libstrongswan/plugins/gcrypt/gcrypt_rsa_public_key.c
src/libstrongswan/plugins/gmp/gmp_diffie_hellman.c
src/libstrongswan/plugins/gmp/gmp_rsa_private_key.c
src/libstrongswan/plugins/gmp/gmp_rsa_public_key.c
src/libstrongswan/plugins/ldap/ldap_fetcher.c
src/libstrongswan/plugins/mysql/mysql_database.c
src/libstrongswan/plugins/mysql/mysql_plugin.c
src/libstrongswan/plugins/nonce/nonce_nonceg.c
src/libstrongswan/plugins/openssl/openssl_crl.c
src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c
src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c
src/libstrongswan/plugins/openssl/openssl_ec_private_key.c
src/libstrongswan/plugins/openssl/openssl_ec_public_key.c
src/libstrongswan/plugins/openssl/openssl_plugin.c
src/libstrongswan/plugins/openssl/openssl_rng.c
src/libstrongswan/plugins/openssl/openssl_rsa_private_key.c
src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c
src/libstrongswan/plugins/openssl/openssl_util.c
src/libstrongswan/plugins/openssl/openssl_x509.c
src/libstrongswan/plugins/padlock/padlock_plugin.c
src/libstrongswan/plugins/pem/pem_builder.c
src/libstrongswan/plugins/pgp/pgp_builder.c
src/libstrongswan/plugins/pgp/pgp_cert.c
src/libstrongswan/plugins/pgp/pgp_encoder.c
src/libstrongswan/plugins/pgp/pgp_utils.c
src/libstrongswan/plugins/pkcs1/pkcs1_builder.c
src/libstrongswan/plugins/pkcs1/pkcs1_encoder.c
src/libstrongswan/plugins/pkcs11/pkcs11_creds.c
src/libstrongswan/plugins/pkcs11/pkcs11_dh.c
src/libstrongswan/plugins/pkcs11/pkcs11_hasher.c
src/libstrongswan/plugins/pkcs11/pkcs11_library.c
src/libstrongswan/plugins/pkcs11/pkcs11_manager.c
src/libstrongswan/plugins/pkcs11/pkcs11_plugin.c
src/libstrongswan/plugins/pkcs11/pkcs11_private_key.c
src/libstrongswan/plugins/pkcs11/pkcs11_public_key.c
src/libstrongswan/plugins/pkcs11/pkcs11_rng.c
src/libstrongswan/plugins/pkcs8/pkcs8_builder.c
src/libstrongswan/plugins/plugin_feature.c
src/libstrongswan/plugins/plugin_loader.c
src/libstrongswan/plugins/pubkey/pubkey_cert.c
src/libstrongswan/plugins/random/random_plugin.c
src/libstrongswan/plugins/random/random_rng.c
src/libstrongswan/plugins/revocation/revocation_validator.c
src/libstrongswan/plugins/soup/soup_fetcher.c
src/libstrongswan/plugins/sqlite/sqlite_database.c
src/libstrongswan/plugins/test_vectors/test_vectors/rng.c
src/libstrongswan/plugins/x509/x509_ac.c
src/libstrongswan/plugins/x509/x509_cert.c
src/libstrongswan/plugins/x509/x509_crl.c
src/libstrongswan/plugins/x509/x509_ocsp_request.c
src/libstrongswan/plugins/x509/x509_ocsp_response.c
src/libstrongswan/plugins/x509/x509_pkcs10.c
src/libstrongswan/plugins/xcbc/xcbc.c
src/libstrongswan/processing/processor.c
src/libstrongswan/processing/scheduler.c
src/libstrongswan/selectors/traffic_selector.c
src/libstrongswan/settings.c
src/libstrongswan/threading/mutex.c
src/libstrongswan/threading/rwlock.c
src/libstrongswan/threading/spinlock.c
src/libstrongswan/threading/thread.c
src/libstrongswan/utils.c
src/libstrongswan/utils/capabilities.c
src/libstrongswan/utils/debug.c [new file with mode: 0644]
src/libstrongswan/utils/debug.h [new file with mode: 0644]
src/libstrongswan/utils/leak_detective.c
src/libstrongswan/utils/optionsfrom.c
src/libtls/tls.c
src/libtls/tls_alert.c
src/libtls/tls_cache.c
src/libtls/tls_crypto.c
src/libtls/tls_eap.c
src/libtls/tls_fragmentation.c
src/libtls/tls_peer.c
src/libtls/tls_protection.c
src/libtls/tls_server.c
src/libtls/tls_socket.c
src/libtnccs/tnc/tnc.c
src/libtnccs/tnc/tnccs/tnccs_manager.c
src/manager/main.c
src/medsrv/controller/peer_controller.c
src/medsrv/filter/auth_filter.c
src/medsrv/main.c
src/openac/openac.c
src/pki/command.c
src/pki/commands/issue.c
src/pki/commands/signcrl.c
src/pki/pki.c
src/scepclient/scep.c
src/scepclient/scepclient.c
src/starter/args.c
src/starter/confread.c
src/starter/invokecharon.c
src/starter/klips.c
src/starter/netkey.c
src/starter/parser.y
src/starter/starter.c
src/starter/starterstroke.c

index 629a8ea..5888075 100644 (file)
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <crypto/diffie_hellman.h>
 
 static void usage()
index ad50d0c..23f8572 100644 (file)
@@ -17,7 +17,7 @@
 #include <unistd.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 static int count = 0;
 
index 5b63381..aba96a8 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <stdio.h>
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <credentials/keys/private_key.h>
 #include <credentials/keys/public_key.h>
 
index 7cad4c4..26427ab 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <stdio.h>
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <credentials/keys/private_key.h>
 #include <credentials/keys/public_key.h>
 
index 6402e60..32c6e8f 100644 (file)
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <credentials/keys/private_key.h>
 
 void start_timing(struct timespec *start)
index 3bdb345..d0d259e 100644 (file)
@@ -22,7 +22,7 @@
 #include <string.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <tls_socket.h>
 #include <networking/host.h>
 #include <credentials/sets/mem_cred.h>
index 3f4fdce..d00e49b 100644 (file)
@@ -16,7 +16,7 @@
 #include <sys/types.h>
 #include <libbridge.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 
 #include "bridge.h"
index a6152bf..28c62c2 100644 (file)
@@ -34,7 +34,7 @@
 #include "cowfs.h"
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/thread.h>
 #include <threading/rwlock.h>
 #include <collections/linked_list.h>
index 4d0ca9b..cc4f5a1 100644 (file)
@@ -23,7 +23,7 @@
 #include <dirent.h>
 #include <errno.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 
 #include "dumm.h"
index 4c6a148..7c7d65a 100644 (file)
@@ -21,7 +21,7 @@
 
 #include <library.h>
 #include <dumm.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 
 #undef PACKAGE_NAME
index 752d307..8e74ca6 100644 (file)
@@ -28,7 +28,7 @@
 #include <termios.h>
 #include <stdarg.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 
 #include "dumm.h"
index 7ac3b71..3e7b010 100644 (file)
@@ -25,7 +25,7 @@
 #include <sys/ioctl.h>
 #include <linux/if_tun.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 
 #include "iface.h"
index 40045cc..54c4fe3 100644 (file)
@@ -25,7 +25,7 @@
 #include <errno.h>
 #include <sys/un.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "mconsole.h"
 
index f9e96a7..bf6073f 100644 (file)
@@ -19,7 +19,7 @@
 #include "../charonservice.h"
 
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <library.h>
 
 typedef struct private_android_attr_t private_android_attr_t;
index 3ed3d75..38bbb47 100644 (file)
@@ -16,7 +16,7 @@
 #include "android_private_key.h"
 
 #include "../android_jni.h"
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_private_key_t private_private_key_t;
 
index 85fe5d4..dc272e6 100644 (file)
@@ -17,7 +17,7 @@
 #include "android_ipsec.h"
 #include "../charonservice.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <library.h>
 #include <hydra.h>
 #include <ipsec.h>
index 430c95b..032fe20 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "../charonservice.h"
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <processing/jobs/callback_job.h>
 #include <threading/mutex.h>
 
index 9c97fbb..17bde6a 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "../android_jni.h"
 #include "../charonservice.h"
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/mutex.h>
 
 typedef struct private_network_manager_t private_network_manager_t;
index 6ff7325..c95b335 100644 (file)
@@ -18,7 +18,7 @@
 #include "vpnservice_builder.h"
 #include "android_jni.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <library.h>
 
 typedef struct private_vpnservice_builder_t private_vpnservice_builder_t;
index 485b1dc..8a6382f 100644 (file)
@@ -28,7 +28,7 @@ typedef struct bus_t bus_t;
 
 #include <stdarg.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <sa/ike_sa.h>
 #include <sa/child_sa.h>
 #include <processing/jobs/job.h>
index 1b07378..65f4ed0 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "addrblock_validator.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <credentials/certificates/x509.h>
 #include <selectors/traffic_selector.h>
 
index e8cd4bf..5f2fd7c 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <time.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <processing/jobs/callback_job.h>
 
 typedef struct private_certexpire_cron_t private_certexpire_cron_t;
index 1b91217..e339b80 100644 (file)
@@ -21,7 +21,7 @@
 #include <limits.h>
 #include <errno.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <daemon.h>
 #include <collections/hashtable.h>
 #include <threading/mutex.h>
index 10f6ec1..f7f634a 100644 (file)
@@ -16,7 +16,7 @@
 #include "eap_peap_avp.h"
 
 #include <eap/eap.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 /**
  * Microsoft Success and Failure Result AVPs
@@ -78,7 +78,7 @@ METHOD(eap_peap_avp_t, build, void,
        }
        */
        else
-       {       
+       {
                avp_data = chunk_skip(data, 4);
        }
        writer->write_data(writer, avp_data);
index 79fd667..f482c5b 100644 (file)
@@ -16,7 +16,7 @@
 #include "eap_peap_peer.h"
 #include "eap_peap_avp.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <daemon.h>
 
 typedef struct private_eap_peap_peer_t private_eap_peap_peer_t;
index 0e80465..5237cb6 100644 (file)
@@ -16,7 +16,7 @@
 #include "eap_peap_server.h"
 #include "eap_peap_avp.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <daemon.h>
 
 typedef struct private_eap_peap_server_t private_eap_peap_server_t;
index 32225d2..3c63e82 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "eap_simaka_pseudonym_provider.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/hashtable.h>
 
 typedef struct private_eap_simaka_pseudonym_provider_t private_eap_simaka_pseudonym_provider_t;
index 7efc0fe..ffa1bae 100644 (file)
@@ -18,7 +18,7 @@
 #include <tnc/tnc.h>
 #include <tnc/tnccs/tnccs_manager.h>
 #include <tls_eap.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <daemon.h>
 
 /**
index 0d531c4..47e0f8a 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "eap_ttls_avp.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 #define AVP_EAP_MESSAGE                79
 #define AVP_HEADER_LEN          8
index 00a4da3..66c9dee 100644 (file)
@@ -16,7 +16,7 @@
 #include "eap_ttls_peer.h"
 #include "eap_ttls_avp.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <daemon.h>
 #include <radius_message.h>
 #include <sa/eap/eap_method.h>
index 1418d6a..464de17 100644 (file)
@@ -16,7 +16,7 @@
 #include "eap_ttls_server.h"
 #include "eap_ttls_avp.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <daemon.h>
 
 #include <sa/eap/eap_method.h>
index eac285c..9cd1ec3 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <daemon.h>
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tnc_ifmap_listener_t private_tnc_ifmap_listener_t;
 
index 6465f50..33480bb 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "tnc_ifmap_soap.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <daemon.h>
 
 #include <axis2_util.h>
index d8e9d09..16d822d 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <tncif_pa_subtypes.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <library.h>
 #include <collections/linked_list.h>
 #include <threading/mutex.h>
index 90a607c..26a5ed2 100644 (file)
@@ -17,7 +17,7 @@
 #include <tnc/imc/imc_manager.h>
 #include <tnc/tnccs/tnccs_manager.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 /**
  * Called by the IMC to inform a TNCC about the set of message types the IMC
index 20ad208..fcbeec6 100644 (file)
@@ -20,7 +20,7 @@
 #include <tncifimc.h>
 
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <daemon.h>
 
 typedef struct private_tnc_imc_manager_t private_tnc_imc_manager_t;
index e82cfc9..a71ffc0 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <tncif_pa_subtypes.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <library.h>
 #include <collections/linked_list.h>
 #include <threading/mutex.h>
index dd11c50..36cdb7f 100644 (file)
@@ -18,7 +18,7 @@
 #include <tnc/imv/imv_manager.h>
 #include <tnc/tnccs/tnccs_manager.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 /**
  * Called by the IMV to inform a TNCS about the set of message types the IMV
index 0985a47..21b7737 100644 (file)
@@ -30,7 +30,7 @@
 
 #include <daemon.h>
 #include <utils/lexparser.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/mutex.h>
 
 typedef struct private_tnc_imv_manager_t private_tnc_imv_manager_t;
index 11b98d8..b39d9cb 100644 (file)
@@ -21,7 +21,7 @@
 #include <tnc/imv/imv_manager.h>
 #include <tnc/imv/imv_recommendations.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 
 typedef struct private_tnc_imv_recommendations_t private_tnc_imv_recommendations_t;
index 77eaa0e..39939d3 100644 (file)
@@ -23,7 +23,7 @@
 #include <radius_mppe.h>
 
 #include <daemon.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <pen/pen.h>
 #include <threading/thread.h>
 #include <processing/jobs/callback_job.h>
index 79aac45..0a96063 100644 (file)
@@ -16,7 +16,7 @@
 #include "tnc_pdp_connections.h"
 
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tnc_pdp_connections_t private_tnc_pdp_connections_t;
 typedef struct entry_t entry_t;
index 2094ec5..0b623d6 100644 (file)
@@ -20,7 +20,7 @@
 #include <tnc/imc/imc_manager.h>
 #include <tnc/imv/imv_manager.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 #include <threading/rwlock.h>
 
index a44319e..1e4ddc1 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <tnc/tnc.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tnc_tnccs_plugin_t private_tnc_tnccs_plugin_t;
 
index 1f63de3..b27458f 100644 (file)
@@ -19,7 +19,7 @@
 #include <tnc/tnccs/tnccs.h>
 
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include <libxml/parser.h>
 
index fa570aa..cf3e584 100644 (file)
@@ -18,7 +18,7 @@
 #include <tnc/tnccs/tnccs.h>
 
 #include <utils/lexparser.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_imc_imv_msg_t private_imc_imv_msg_t;
 
index d0df4e7..ba92c26 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "tnccs_error_msg.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 ENUM(tnccs_error_type_names, TNCCS_ERROR_BATCH_TOO_LONG, TNCCS_ERROR_OTHER,
        "batch-too-long",
@@ -108,7 +108,7 @@ tnccs_msg_t *tnccs_error_msg_create_from_node(xmlNodePtr node)
 {
        private_tnccs_error_msg_t *this;
        xmlChar *error_type_name, *error_msg;
-       
+
        INIT(this,
                .public = {
                        .tnccs_msg_interface = {
index 5a05039..79c6639 100644 (file)
@@ -22,7 +22,7 @@
 #include "tnccs_tncs_contact_info_msg.h"
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 ENUM(tnccs_msg_type_names, IMC_IMV_MSG, TNCCS_MSG_ROOF,
        "IMC-IMV",
index fd85350..e1c193e 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "tnccs_preferred_language_msg.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tnccs_preferred_language_msg_t private_tnccs_preferred_language_msg_t;
 
index af60a4b..cf3c367 100644 (file)
@@ -16,7 +16,7 @@
 #include "tnccs_reason_strings_msg.h"
 #include "tnccs_error_msg.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tnccs_reason_strings_msg_t private_tnccs_reason_strings_msg_t;
 
index 6102242..32e123b 100644 (file)
@@ -16,7 +16,7 @@
 #include "tnccs_recommendation_msg.h"
 #include "tnccs_error_msg.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tnccs_recommendation_msg_t private_tnccs_recommendation_msg_t;
 
index b8aac30..fe288f0 100644 (file)
@@ -14,7 +14,7 @@
 
 #include "tnccs_tncs_contact_info_msg.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tnccs_tncs_contact_info_msg_t private_tnccs_tncs_contact_info_msg_t;
 
index 56858a8..cfc29d6 100644 (file)
@@ -31,7 +31,7 @@
 #include <tnc/tnccs/tnccs.h>
 #include <tnc/tnccs/tnccs_manager.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <daemon.h>
 #include <threading/mutex.h>
 
index 3bf048a..3a2c70f 100644 (file)
@@ -24,7 +24,7 @@
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
 #include <pen/pen.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 ENUM(pb_tnc_batch_type_names, PB_BATCH_CDATA, PB_BATCH_CLOSE,
        "CDATA",
index 974db4d..cdd0d0d 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 ENUM(pb_access_recommendation_code_names, PB_REC_ACCESS_ALLOWED, PB_REC_QUARANTINED,
        "Access Allowed",
@@ -113,7 +113,7 @@ METHOD(pb_tnc_msg_t, process, status_t,
                *offset = 2;
                return FAILED;
        }
-               
+
        return SUCCESS;
 }
 
index ee06575..4e50446 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_pb_assessment_result_msg_t private_pb_assessment_result_msg_t;
 
@@ -106,7 +106,7 @@ METHOD(pb_tnc_msg_t, process, status_t,
                *offset = 0;
                return FAILED;
        }
-               
+
        return SUCCESS;
 }
 
index 457d3da..d048f43 100644 (file)
@@ -20,7 +20,7 @@
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
 #include <pen/pen.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 ENUM(pb_tnc_error_code_names, PB_ERROR_UNEXPECTED_BATCH_TYPE,
                                                          PB_ERROR_VERSION_NOT_SUPPORTED,
@@ -88,7 +88,7 @@ struct private_pb_error_msg_t {
        u_int32_t error_offset;
 
        /**
-        * Bad PB-TNC version received 
+        * Bad PB-TNC version received
         */
        u_int8_t bad_version;
 
index 46df544..70a03cd 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_pb_language_preference_msg_t private_pb_language_preference_msg_t;
 
index bbad9bf..2d2c131 100644 (file)
@@ -22,7 +22,7 @@
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
 #include <pen/pen.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_pb_pa_msg_t private_pb_pa_msg_t;
 
index 511b454..935c52d 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_pb_reason_string_msg_t private_pb_reason_string_msg_t;
 
index c853f03..63d94b9 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 ENUM(pb_tnc_remed_param_type_names, PB_REMEDIATION_URI, PB_REMEDIATION_STRING,
        "Remediation-URI",
index 5e95131..43f1854 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "pb_tnc_state_machine.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 ENUM(pb_tnc_state_names, PB_STATE_INIT, PB_STATE_END,
        "Init",
index 4d917ed..8540f46 100644 (file)
@@ -34,7 +34,7 @@
 #include <tnc/imc/imc_manager.h>
 #include <tnc/imv/imv_manager.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <daemon.h>
 #include <threading/mutex.h>
 #include <collections/linked_list.h>
index b68d2dd..03795a9 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <tnc/tnc.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tnccs_dynamic_t private_tnccs_dynamic_t;
 
@@ -120,7 +120,7 @@ METHOD(tls_t, destroy, void,
        private_tnccs_dynamic_t *this)
 {
        DESTROY_IF(this->tls);
-       free(this);     
+       free(this);
 }
 
 /**
index 6b89635..e5a02c6 100644 (file)
@@ -22,7 +22,7 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/thread.h>
 #include <threading/condvar.h>
 #include <threading/mutex.h>
index 6ca4740..5d03227 100644 (file)
@@ -18,7 +18,7 @@
 #include "request.h"
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <stdlib.h>
 #include <pthread.h>
 #include <string.h>
index 1375c29..a6ca67d 100644 (file)
@@ -18,7 +18,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_smtp_t private_smtp_t;
 
index dd3963b..5fda8b4 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "attribute_manager.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 #include <threading/rwlock.h>
 
index 1c5ea53..af53e10 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "mem_pool.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/hashtable.h>
 #include <collections/linked_list.h>
 #include <threading/mutex.h>
index 7d62565..16fb3ab 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "hydra.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_hydra_t private_hydra_t;
 
index 79a2ab9..5425861 100644 (file)
@@ -40,7 +40,7 @@
 #include "kernel_interface.h"
 
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/mutex.h>
 #include <collections/linked_list.h>
 
index ca32219..1f333d0 100644 (file)
@@ -19,7 +19,7 @@
 #include <time.h>
 
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 #include <threading/rwlock.h>
 
index c04ec9a..69e6f7b 100644 (file)
@@ -14,7 +14,7 @@
  */
 
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "attr_sql_plugin.h"
 #include "sql_attribute.h"
index 1d5fddb..f355e96 100644 (file)
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <library.h>
 #include <networking/host.h>
 #include <utils/identification.h>
index a7d90e7..1a4ee7a 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <time.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <library.h>
 
 #include "sql_attribute.h"
index 2c1d7e9..431174e 100644 (file)
@@ -29,7 +29,7 @@
 #include "kernel_klips_ipsec.h"
 
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 #include <threading/thread.h>
 #include <threading/mutex.h>
index 8cd19a2..f9b2634 100644 (file)
@@ -36,7 +36,7 @@
 #include "kernel_netlink_shared.h"
 
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/thread.h>
 #include <threading/mutex.h>
 #include <collections/hashtable.h>
index b39ffa3..8b8ab21 100644 (file)
@@ -49,7 +49,7 @@
 #include "kernel_netlink_shared.h"
 
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/thread.h>
 #include <threading/mutex.h>
 #include <threading/rwlock.h>
index 285f6c8..561e852 100644 (file)
@@ -21,7 +21,7 @@
 
 #include "kernel_netlink_shared.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/mutex.h>
 
 typedef struct private_netlink_socket_t private_netlink_socket_t;
index e1a8384..71bdbbe 100644 (file)
@@ -58,7 +58,7 @@
 #include "kernel_pfkey_ipsec.h"
 
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <networking/host.h>
 #include <collections/linked_list.h>
 #include <collections/hashtable.h>
index 6d52456..d45c5bb 100644 (file)
@@ -24,7 +24,7 @@
 #include "kernel_pfroute_net.h"
 
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <networking/host.h>
 #include <threading/thread.h>
 #include <threading/mutex.h>
index 0a3094f..6b8d6be 100644 (file)
@@ -21,7 +21,7 @@
 #include <unistd.h>
 
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/mutex.h>
 
 /* path to resolvconf executable */
index 6893730..6f77642 100644 (file)
@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_ietf_attr_assess_result_t private_ietf_attr_assess_result_t;
 
index 1b09319..1c2d4f5 100644 (file)
@@ -21,7 +21,7 @@
 #include <bio/bio_reader.h>
 #include <collections/linked_list.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_ietf_attr_attr_request_t private_ietf_attr_attr_request_t;
 
index 4c0d7eb..08a6eed 100644 (file)
@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_ietf_attr_default_pwd_enabled_t private_ietf_attr_default_pwd_enabled_t;
 
index c7deea0..4f52206 100644 (file)
@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_ietf_attr_fwd_enabled_t private_ietf_attr_fwd_enabled_t;
 
index e0ff748..c19bd92 100644 (file)
@@ -21,7 +21,7 @@
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 
 typedef struct private_ietf_attr_installed_packages_t private_ietf_attr_installed_packages_t;
index 7d851bb..9c03017 100644 (file)
@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_ietf_attr_numeric_version_t private_ietf_attr_numeric_version_t;
 
index 6c820a6..cf32190 100644 (file)
@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include <time.h>
 
index 46f5d67..e2f6fc3 100644 (file)
@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 ENUM(pa_tnc_error_code_names, PA_ERROR_RESERVED,
                                                          PA_ERROR_ATTR_TYPE_NOT_SUPPORTED,
@@ -80,7 +80,7 @@ typedef struct private_ietf_attr_pa_tnc_error_t private_ietf_attr_pa_tnc_error_t
  *  |  Max Version  |  Min Version  |            Reserved           |
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  */
-       
+
 #define PA_ERROR_VERSION_RESERVED      0x0000
 
 /**
@@ -186,7 +186,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer->write_uint24(writer, this->error_code.vendor_id);
        writer->write_uint32(writer, this->error_code.type);
        writer->write_data  (writer, this->msg_info);
-       
+
        if (this->error_code.vendor_id == PEN_IETF)
        {
                switch (this->error_code.type)
@@ -272,7 +272,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
        }
        reader->destroy(reader);
 
-       return SUCCESS; 
+       return SUCCESS;
 }
 
 METHOD(pa_tnc_attr_t, get_ref, pa_tnc_attr_t*,
index 34bcf89..80b77f5 100644 (file)
@@ -18,7 +18,7 @@
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 
 typedef struct private_ietf_attr_port_filter_t private_ietf_attr_port_filter_t;
index 719619f..23aac51 100644 (file)
@@ -17,7 +17,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_ietf_attr_product_info_t private_ietf_attr_product_info_t;
 
index 7ec0b3c..fcb6d95 100644 (file)
@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_ietf_attr_remediation_instr_t private_ietf_attr_remediation_instr_t;
 
index 7cc3447..964abeb 100644 (file)
@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_ietf_attr_string_version_t private_ietf_attr_string_version_t;
 
@@ -143,7 +143,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
                return FAILED;
        }
        reader = bio_reader_create(this->value);
-       
+
        if (!reader->read_data8(reader, &version))
        {
                DBG1(DBG_TNC, "insufficient data for IETF product version number");
@@ -187,7 +187,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
                *offset += 1 + (pos - config.ptr);
                goto end;
        }
-       
+
        this->version = chunk_clone(version);
        this->build = chunk_clone(build);
        this->config = chunk_clone(config);
index 911a5b0..1616234 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <tncif_names.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/rwlock.h>
 
 typedef struct private_imc_agent_t private_imc_agent_t;
@@ -353,7 +353,7 @@ METHOD(imc_agent_t, create_state, TNC_Result,
        has_long = get_bool_attribute(this, conn_id, TNC_ATTRIBUTEID_HAS_LONG_TYPES);
        has_excl = get_bool_attribute(this, conn_id, TNC_ATTRIBUTEID_HAS_EXCLUSIVE);
        has_soh  = get_bool_attribute(this, conn_id, TNC_ATTRIBUTEID_HAS_SOH);
-       tnccs_p = get_str_attribute(this, conn_id, TNC_ATTRIBUTEID_IFTNCCS_PROTOCOL); 
+       tnccs_p = get_str_attribute(this, conn_id, TNC_ATTRIBUTEID_IFTNCCS_PROTOCOL);
        tnccs_v = get_str_attribute(this, conn_id, TNC_ATTRIBUTEID_IFTNCCS_VERSION);
        t_p = get_str_attribute(this, conn_id, TNC_ATTRIBUTEID_IFT_PROTOCOL);
        t_v = get_str_attribute(this, conn_id, TNC_ATTRIBUTEID_IFT_VERSION);
@@ -408,7 +408,7 @@ METHOD(imc_agent_t, change_state, TNC_Result,
                case TNC_CONNECTION_STATE_ACCESS_ISOLATED:
                case TNC_CONNECTION_STATE_ACCESS_NONE:
                        state = find_connection(this, connection_id);
-                       
+
                        if (!state)
                        {
                                DBG1(DBG_IMC, "IMC %u \"%s\" has no state for Connection ID %u",
@@ -436,7 +436,7 @@ METHOD(imc_agent_t, change_state, TNC_Result,
                        DBG1(DBG_IMC, "IMC %u \"%s\" was notified of unknown state %u "
                                                  "for Connection ID %u",
                                                  this->id, this->name, new_state, connection_id);
-                       return TNC_RESULT_INVALID_PARAMETER;            
+                       return TNC_RESULT_INVALID_PARAMETER;
        }
        return TNC_RESULT_SUCCESS;
 }
@@ -562,7 +562,7 @@ imc_agent_t *imc_agent_create(const char *name,
                .connections = linked_list_create(),
                .connection_lock = rwlock_create(RWLOCK_TYPE_DEFAULT),
        );
-       
+
        *actual_version = TNC_IFIMC_VERSION_1;
        DBG1(DBG_IMC, "IMC %u \"%s\" initialized", this->id, this->name);
 
index 48a2955..60613d0 100644 (file)
@@ -22,7 +22,7 @@
 
 #include <pen/pen.h>
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_imc_msg_t private_imc_msg_t;
 
index b84548f..f9de41f 100644 (file)
@@ -17,7 +17,7 @@
 #include "ita/ita_attr.h"
 
 #include <utils.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <pen/pen.h>
 
 #include <syslog.h>
@@ -119,7 +119,7 @@ bool libimcv_init(void)
                                                                        "libimcv.debug_level", IMCV_DEBUG_LEVEL);
                imcv_stderr_quiet = lib->settings->get_int(lib->settings,
                                                                        "libimcv.stderr_quiet", FALSE);
-               
+
                /* activate the imcv debugging hook */
                dbg = imcv_dbg;
                openlog("imcv", 0, LOG_DAEMON);
@@ -155,7 +155,7 @@ void libimcv_deinit(void)
        }
        if (ref_put(&libstrongswan_ref))
        {
-               library_deinit();               
+               library_deinit();
        }
 }
 
index a21fb93..d664dc9 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <tncif_names.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/rwlock.h>
 
 typedef struct private_imv_agent_t private_imv_agent_t;
index e69121a..911dbfd 100644 (file)
@@ -22,7 +22,7 @@
 
 #include <pen/pen.h>
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_imv_msg_t private_imv_msg_t;
 
index d43e477..5869557 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <pen/pen.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_ita_attr_command_t private_ita_attr_command_t;
 
@@ -100,7 +100,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
        memcpy(this->command, this->value.ptr, this->value.len);
        this->command[this->value.len] = '\0';
 
-       return SUCCESS; 
+       return SUCCESS;
 }
 
 METHOD(pa_tnc_attr_t, get_ref, pa_tnc_attr_t*,
index f122256..4fb60a7 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <pen/pen.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_ita_attr_dummy_t private_ita_attr_dummy_t;
 
@@ -98,7 +98,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
 {
        this->size = this->value.len;
 
-       return SUCCESS; 
+       return SUCCESS;
 }
 
 METHOD(pa_tnc_attr_t, get_ref, pa_tnc_attr_t*,
index 8846c84..c0661dc 100644 (file)
@@ -19,7 +19,7 @@
 #include <stdio.h>
 
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_os_info_t private_os_info_t;
 
index 3df660e..900a557 100644 (file)
@@ -17,7 +17,7 @@
 #include "pa_tnc_attr_manager.h"
 
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_pa_tnc_attr_manager_t private_pa_tnc_attr_manager_t;
 typedef struct entry_t entry_t;
index b7cdd37..97d670e 100644 (file)
@@ -21,7 +21,7 @@
 #include <bio/bio_reader.h>
 #include <collections/linked_list.h>
 #include <pen/pen.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 
 typedef struct private_pa_tnc_msg_t private_pa_tnc_msg_t;
index acfa3e0..f50b8aa 100644 (file)
@@ -32,7 +32,7 @@
 #include <tncif_pa_subtypes.h>
 
 #include <pen/pen.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 /* IMC definitions */
 
@@ -329,7 +329,7 @@ static TNC_Result receive_message(imc_msg_t *in_msg)
                                                break;
                                }
                        }
-                       e->destroy(e); 
+                       e->destroy(e);
                }
                else if (attr_type.type == IETF_ATTR_REMEDIATION_INSTRUCTIONS)
                {
index 859e1f8..f49959a 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <tncif_names.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_imc_os_state_t private_imc_os_state_t;
 
@@ -155,7 +155,7 @@ imc_state_t *imc_os_state_create(TNC_ConnectionID connection_id)
                .result = TNC_IMV_EVALUATION_RESULT_DONT_KNOW,
                .connection_id = connection_id,
        );
-       
+
        return &this->public.interface;
 }
 
index c97dd0d..5c7985e 100644 (file)
@@ -24,7 +24,7 @@
 
 #include <pen/pen.h>
 #include <utils/lexparser.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include <stdio.h>
 
index d47c4ec..b5a6cdd 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <tncif_names.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_imc_scanner_state_t private_imc_scanner_state_t;
 
@@ -155,7 +155,7 @@ imc_state_t *imc_scanner_state_create(TNC_ConnectionID connection_id)
                .result = TNC_IMV_EVALUATION_RESULT_DONT_KNOW,
                .connection_id = connection_id,
        );
-       
+
        return &this->public.interface;
 }
 
index 472354e..87efaff 100644 (file)
@@ -25,7 +25,7 @@
 #include <tncif_pa_subtypes.h>
 
 #include <pen/pen.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 /* IMC definitions */
 
@@ -36,7 +36,7 @@ static pen_type_t msg_types[] = {
 };
 
 static imc_agent_t *imc_test;
+
 /**
  * see section 3.8.1 of TCG TNC IF-IMC Specification 1.3
  */
index fba018d..e7beca0 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <tncif_names.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 
 typedef struct private_imc_test_state_t private_imc_test_state_t;
index 3bfe89d..2346918 100644 (file)
@@ -35,7 +35,7 @@
 
 #include <pen/pen.h>
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 /* IMV definitions */
 
index 1c5c781..e36d4ae 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "imv_os_state.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_imv_os_state_t private_imv_os_state_t;
 
@@ -81,7 +81,7 @@ struct entry_t {
 };
 
 /**
- * Table of multi-lingual reason string entries 
+ * Table of multi-lingual reason string entries
  */
 static entry_t reasons[] = {
        { "en", "" },
@@ -211,7 +211,7 @@ imv_state_t *imv_os_state_create(TNC_ConnectionID connection_id)
                .eval = TNC_IMV_EVALUATION_RESULT_DONT_KNOW,
                .connection_id = connection_id,
        );
-       
+
        return &this->public.interface;
 }
 
index 4d9762c..1705d30 100644 (file)
@@ -27,7 +27,7 @@
 #include <pen/pen.h>
 #include <collections/linked_list.h>
 #include <utils/lexparser.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 /* IMV definitions */
 
index fecc84e..fbb70d7 100644 (file)
@@ -16,7 +16,7 @@
 #include "imv_scanner_state.h"
 
 #include <utils/lexparser.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_imv_scanner_state_t private_imv_scanner_state_t;
 
@@ -87,7 +87,7 @@ struct entry_t {
 };
 
 /**
- * Table of multi-lingual reason string entries 
+ * Table of multi-lingual reason string entries
  */
 static entry_t reasons[] = {
        { "en", "The following ports are open:" },
@@ -189,7 +189,7 @@ METHOD(imv_state_t, get_reason_string, bool,
                        if (chunk_equals(lang, pref_lang))
                        {
                                this->reason_string = chunk_cat("cc",
-                                                                       chunk_create(reasons[i].string, 
+                                                                       chunk_create(reasons[i].string,
                                                                                                 strlen(reasons[i].string)),
                                                                        chunk_create(this->violating_ports,
                                                                                                 strlen(this->violating_ports)));
@@ -208,7 +208,7 @@ METHOD(imv_state_t, get_reason_string, bool,
                                                                        chunk_create(this->violating_ports,
                                                                                                 strlen(this->violating_ports)));
        *reason_string = this->reason_string;
-       *reason_language = chunk_create(reasons[0].lang, 
+       *reason_language = chunk_create(reasons[0].lang,
                                                                        strlen(reasons[0].lang));
        return TRUE;
 }
@@ -256,7 +256,7 @@ imv_state_t *imv_scanner_state_create(TNC_ConnectionID connection_id)
                .eval = TNC_IMV_EVALUATION_RESULT_DONT_KNOW,
                .connection_id = connection_id,
        );
-       
+
        return &this->public.interface;
 }
 
index 051600d..973edad 100644 (file)
@@ -27,7 +27,7 @@
 #include <tncif_pa_subtypes.h>
 
 #include <pen/pen.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 /* IMV definitions */
 
@@ -130,7 +130,7 @@ static TNC_Result receive_message(imv_state_t *state, imv_msg_t *in_msg)
                {
                        ita_attr_command_t *ita_attr;
                        char *command;
-       
+
                        received_command = TRUE;
                        ita_attr = (ita_attr_command_t*)attr;
                        command = ita_attr->get_command(ita_attr);
@@ -139,19 +139,19 @@ static TNC_Result receive_message(imv_state_t *state, imv_msg_t *in_msg)
                        {
                                state->set_recommendation(state,
                                                                TNC_IMV_ACTION_RECOMMENDATION_ALLOW,
-                                                               TNC_IMV_EVALUATION_RESULT_COMPLIANT);                     
+                                                               TNC_IMV_EVALUATION_RESULT_COMPLIANT);
                        }
                        else if (streq(command, "isolate"))
                        {
                                state->set_recommendation(state,
                                                                TNC_IMV_ACTION_RECOMMENDATION_ISOLATE,
-                                                               TNC_IMV_EVALUATION_RESULT_NONCOMPLIANT_MINOR);                    
+                                                               TNC_IMV_EVALUATION_RESULT_NONCOMPLIANT_MINOR);
                        }
                        else if (streq(command, "block") || streq(command, "none"))
                        {
                                state->set_recommendation(state,
                                                                TNC_IMV_ACTION_RECOMMENDATION_NO_ACCESS,
-                                                               TNC_IMV_EVALUATION_RESULT_NONCOMPLIANT_MAJOR);                    
+                                                               TNC_IMV_EVALUATION_RESULT_NONCOMPLIANT_MAJOR);
                        }
                        else if (streq(command, "retry"))
                        {
@@ -162,7 +162,7 @@ static TNC_Result receive_message(imv_state_t *state, imv_msg_t *in_msg)
                                DBG1(DBG_IMV, "unsupported ITA Command '%s'", command);
                                state->set_recommendation(state,
                                                                TNC_IMV_ACTION_RECOMMENDATION_NO_RECOMMENDATION,
-                                                               TNC_IMV_EVALUATION_RESULT_ERROR);                         
+                                                               TNC_IMV_EVALUATION_RESULT_ERROR);
                        }
                }
                else if (attr_type.type == ITA_ATTR_DUMMY)
@@ -199,7 +199,7 @@ static TNC_Result receive_message(imv_state_t *state, imv_msg_t *in_msg)
                                                                                        state->get_connection_id(state),
                                                                                        TNC_RETRY_REASON_IMV_SERIOUS_EVENT);
        }
-       
+
        /* repeat the measurement ? */
        if (test_state->another_round(test_state, in_msg->get_src_id(in_msg)))
        {
index 53d4c07..1fb6df8 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <utils/lexparser.h>
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_imv_test_state_t private_imv_test_state_t;
 
index dc3ad3f..44b1117 100644 (file)
@@ -21,7 +21,7 @@
 #include "esp_context.h"
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <crypto/crypters/crypter.h>
 #include <crypto/signers/signer.h>
 
index bfcab95..16cc687 100644 (file)
@@ -19,7 +19,7 @@
 #include "esp_packet.h"
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <crypto/crypters/crypter.h>
 #include <crypto/signers/signer.h>
 #include <bio/bio_reader.h>
index 096ca33..5c8cc2e 100644 (file)
@@ -17,7 +17,7 @@
 #include "ip_packet.h"
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
index 50d9163..6c9a26a 100644 (file)
@@ -17,7 +17,7 @@
 
 #include "ipsec.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_ipsec_t private_ipsec_t;
 
index 19643d5..d7d7e82 100644 (file)
@@ -18,7 +18,7 @@
 #include "ipsec_event_relay.h"
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/rwlock.h>
 #include <collections/linked_list.h>
 #include <collections/blocking_queue.h>
index af8ea9f..8407921 100644 (file)
@@ -17,7 +17,7 @@
 
 #include "ipsec_policy.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_ipsec_policy_t private_ipsec_policy_t;
 
index dd904ba..72f94ec 100644 (file)
@@ -17,7 +17,7 @@
 
 #include "ipsec_policy_mgr.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/rwlock.h>
 #include <collections/linked_list.h>
 
index 4d3649d..66f43a4 100644 (file)
@@ -16,7 +16,7 @@
 #include "ipsec.h"
 #include "ipsec_processor.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <library.h>
 #include <threading/rwlock.h>
 #include <collections/blocking_queue.h>
index 6685225..2ff5cff 100644 (file)
@@ -18,7 +18,7 @@
 #include "ipsec_sa.h"
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_ipsec_sa_t private_ipsec_sa_t;
 
index 32f2cdb..2874897 100644 (file)
@@ -18,7 +18,7 @@
 #include "ipsec.h"
 #include "ipsec_sa_mgr.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <library.h>
 #include <processing/jobs/callback_job.h>
 #include <threading/condvar.h>
index 384ee4e..9511082 100644 (file)
@@ -23,7 +23,7 @@
 #include "pts/components/ita/ita_comp_tgrub.h"
 
 #include <imcv.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 /**
  * PTS Functional Component manager
index 9086f72..5a3b91d 100644 (file)
@@ -36,7 +36,7 @@
 #include <tncif_pa_subtypes.h>
 
 #include <pen/pen.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 
 /* IMC definitions */
index 8ee02e4..88d24dd 100644 (file)
@@ -43,7 +43,7 @@
 #include <tcg/tcg_pts_attr_req_file_meta.h>
 #include <tcg/tcg_pts_attr_unix_file_meta.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <utils/lexparser.h>
 
 #define DEFAULT_NONCE_LEN              20
@@ -173,7 +173,7 @@ bool imc_attestation_process(pa_tnc_attr_t *attr, imc_msg_t *msg,
                                                          "have differing lengths");
                                return FALSE;
                        }
-                                       
+
                        pts->set_peer_public_value(pts, initiator_value, initiator_nonce);
                        if (!pts->calculate_secret(pts))
                        {
@@ -334,7 +334,7 @@ bool imc_attestation_process(pa_tnc_attr_t *attr, imc_msg_t *msg,
                        u_int8_t flags;
                        status_t status;
                        enumerator_t *e;
-                       
+
                        attr_info = attr->get_value(attr);
                        attr_cast = (tcg_pts_attr_req_func_comp_evid_t*)attr;
 
@@ -350,7 +350,7 @@ bool imc_attestation_process(pa_tnc_attr_t *attr, imc_msg_t *msg,
                                if (flags & PTS_REQ_FUNC_COMP_EVID_TTC)
                                {
                                        error_code = pen_type_create(PEN_TCG,
-                                                                                                TCG_PTS_UNABLE_DET_TTC); 
+                                                                                                TCG_PTS_UNABLE_DET_TTC);
                                        attr = ietf_attr_pa_tnc_error_create(error_code, attr_info);
                                        msg->add_attribute(msg, attr);
                                        break;
index 5ff50c0..4fcbdfa 100644 (file)
@@ -20,7 +20,7 @@
 #include <tncif_names.h>
 
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_imc_attestation_state_t private_imc_attestation_state_t;
 typedef struct func_comp_t func_comp_t;
index a202d12..a938688 100644 (file)
@@ -22,7 +22,7 @@
 #include <syslog.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include <imcv.h>
 #include <libpts.h>
index e3536d1..647faf4 100644 (file)
@@ -36,7 +36,7 @@
 #include <tncif_pa_subtypes.h>
 
 #include <pen/pen.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <credentials/credential_manager.h>
 #include <collections/linked_list.h>
 
index 2f36724..b4feec7 100644 (file)
@@ -27,7 +27,7 @@
 #include <tcg/tcg_pts_attr_req_file_meas.h>
 #include <tcg/tcg_pts_attr_req_file_meta.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 bool imv_attestation_build(imv_msg_t *out_msg,
                                                   imv_attestation_state_t *attestation_state,
@@ -177,7 +177,7 @@ bool imv_attestation_build(imv_msg_t *out_msg,
                                have_request = TRUE;
                        }
                        enumerator->destroy(enumerator);
-                       
+
                        /* Send Request File Measurement attribute */
                        enumerator = pts_db->create_file_meas_enumerator(pts_db,
                                                                                                                         platform_info);
index 39ba9f0..db623f7 100644 (file)
@@ -29,7 +29,7 @@
 #include <tcg/tcg_pts_attr_tpm_version_info.h>
 #include <tcg/tcg_pts_attr_unix_file_meta.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <crypto/hashers/hasher.h>
 
 #include <inttypes.h>
@@ -43,7 +43,7 @@ bool imv_attestation_process(pa_tnc_attr_t *attr, imv_msg_t *out_msg,
 {
        pen_type_t attr_type;
        pts_t *pts;
-       
+
        pts = attestation_state->get_pts(attestation_state);
        attr_type = attr->get_type(attr);
 
index d5724f6..1c40f3f 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <utils/lexparser.h>
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_imv_attestation_state_t private_imv_attestation_state_t;
 typedef struct file_meas_request_t file_meas_request_t;
index ad5d988..02470f5 100644 (file)
@@ -20,7 +20,7 @@
 #include "pts/pts_pcr.h"
 #include "pts/components/pts_component.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <pen/pen.h>
 
 #include <sys/types.h>
@@ -96,12 +96,12 @@ struct pts_ita_comp_ima_t {
        int ima_cid;
 
        /**
-        * Component is registering IMA BIOS measurements 
+        * Component is registering IMA BIOS measurements
         */
        bool is_bios_registering;
 
        /**
-        * Component is registering IMA boot aggregate measurement 
+        * Component is registering IMA boot aggregate measurement
         */
        bool is_ima_registering;
 
@@ -184,7 +184,7 @@ struct bios_entry_t {
 
        /**
         * SHA1 measurement hash
-        */     
+        */
        chunk_t measurement;
 };
 
@@ -528,7 +528,7 @@ METHOD(pts_component_t, measure, status_t,
                                evid = extend_pcr(this, qualifier, pcrs, bios_entry->pcr,
                                                                  bios_entry->measurement);
                                free(bios_entry);
-       
+
                                this->state = this->bios_list->get_count(this->bios_list) ?
                                                                                IMA_STATE_BIOS : IMA_STATE_INIT;
                                break;
@@ -823,7 +823,7 @@ METHOD(pts_component_t, finalize, bool,
        u_int32_t vid, name;
        enum_name_t *names;
        bool success = TRUE;
-               
+
        this->name->set_qualifier(this->name, qualifier);
        vid = this->name->get_vendor_id(this->name);
        name = this->name->get_name(this->name);
@@ -917,7 +917,7 @@ METHOD(pts_component_t, destroy, void,
                }
                this->bios_list->destroy_function(this->bios_list,
                                                                                 (void *)free_bios_entry);
-               this->ima_list->destroy_function(this->ima_list, 
+               this->ima_list->destroy_function(this->ima_list,
                                                                                 (void *)free_ima_entry);
                this->name->destroy(this->name);
                free(this->keyid.ptr);
index 9deeb19..8fb5abd 100644 (file)
@@ -19,7 +19,7 @@
 #include "libpts.h"
 #include "pts/components/pts_component.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <pen/pen.h>
 
 typedef struct pts_ita_comp_tboot_t pts_ita_comp_tboot_t;
@@ -66,7 +66,7 @@ struct pts_ita_comp_tboot_t {
        int kid;
 
        /**
-        * Component is registering measurements 
+        * Component is registering measurements
         */
        bool is_registering;
 
@@ -123,7 +123,7 @@ METHOD(pts_component_t, measure, status_t,
        char *meas_hex, *pcr_before_hex, *pcr_after_hex;
        chunk_t measurement, pcr_before, pcr_after;
        u_int32_t extended_pcr;
-       
+
        switch (this->seq_no++)
        {
                case 0:
@@ -286,7 +286,7 @@ METHOD(pts_component_t, finalize, bool,
 {
        u_int32_t vid, name;
        enum_name_t *names;
-               
+
        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);
index 986f7ac..e3acd87 100644 (file)
@@ -18,7 +18,7 @@
 
 #include "pts/components/pts_component.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <pen/pen.h>
 
 typedef struct pts_ita_comp_tgrub_t pts_ita_comp_tgrub_t;
@@ -90,7 +90,7 @@ METHOD(pts_component_t, measure, status_t,
        /* Provisional implementation for TGRUB */
        extended_pcr = PCR_DEBUG;
        time(&measurement_time);
-               
+
        if (!pts->read_pcr(pts, extended_pcr, &pcr_after))
        {
                DBG1(DBG_PTS, "error occurred while reading PCR: %d", extended_pcr);
@@ -103,7 +103,7 @@ METHOD(pts_component_t, measure, status_t,
 
        measurement = chunk_alloc(pcr_len);
        memset(measurement.ptr, 0x00, measurement.len);
-               
+
        pcr_before = chunk_alloc(pcr_len);
        memset(pcr_before.ptr, 0x00, pcr_before.len);
 
@@ -150,7 +150,7 @@ METHOD(pts_component_t, verify, status_t,
                        return SUCCESS;
                }
        }
-       
+
        return SUCCESS;
 }
 
index 0507174..08c3d5e 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "pts/components/pts_comp_evidence.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_pts_comp_evidence_t private_pts_comp_evidence_t;
 
@@ -148,7 +148,7 @@ METHOD(pts_comp_evidence_t, get_pcr_info, bool,
 METHOD(pts_comp_evidence_t, set_pcr_info, void,
        private_pts_comp_evidence_t *this, chunk_t pcr_before, chunk_t pcr_after)
 {
-       this->has_pcr_info = TRUE;      
+       this->has_pcr_info = TRUE;
        this->pcr_before = pcr_before;
        this->pcr_after =  pcr_after;
 
index 7501be0..6c630f8 100644 (file)
@@ -17,7 +17,7 @@
 #include "libpts.h"
 #include "pts/components/pts_comp_func_name.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_pts_comp_func_name_t private_pts_comp_func_name_t;
 
index 40fea1c..9c1375b 100644 (file)
@@ -16,7 +16,7 @@
 #include "pts/components/pts_component_manager.h"
 
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_pts_component_manager_t private_pts_component_manager_t;
 typedef struct vendor_entry_t vendor_entry_t;
index 7d5c7b9..d7537b5 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "pts.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <crypto/hashers/hasher.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
index 5a6197b..bc483eb 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "pts_creds.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <credentials/certificates/x509.h>
 #include <credentials/sets/mem_cred.h>
 
index 946f37e..e0778aa 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "pts_database.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <crypto/hashers/hasher.h>
 
 
@@ -151,7 +151,7 @@ METHOD(pts_database_t, check_file_measurement, status_t,
                {
                        status = VERIFY_ERROR;
                }
-       }       
+       }
        e->destroy(e);
 
        return status;
@@ -179,7 +179,7 @@ METHOD(pts_database_t, check_comp_measurement, status_t,
        enumerator_t *e;
        chunk_t hash;
        status_t status = NOT_FOUND;
-       
+
        e = this->db->query(this->db,
                                        "SELECT hash FROM component_hashes "
                                        "WHERE component = ?  AND key = ? "
@@ -188,7 +188,7 @@ METHOD(pts_database_t, check_comp_measurement, status_t,
                                        DB_INT, pcr, DB_INT, algo, DB_BLOB);
        if (!e)
        {
-               DBG1(DBG_PTS, "no database query enumerator returned"); 
+               DBG1(DBG_PTS, "no database query enumerator returned");
                return FAILED;
        }
 
@@ -225,7 +225,7 @@ METHOD(pts_database_t, insert_comp_measurement, status_t,
        int seq_no, int pcr, pts_meas_algorithms_t algo)
 {
        int id;
-       
+
        if (this->db->execute(this->db, &id,
                                        "INSERT INTO component_hashes "
                                        "(component, key, seq_no, pcr, algo, hash) "
index fb14132..41a4360 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "pts_dh_group.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 /**
  * Described in header.
@@ -27,7 +27,7 @@ bool pts_dh_group_probe(pts_dh_group_t *dh_groups)
        const char *plugin_name;
        char format1[] = "  %s PTS DH group %N[%s] available";
        char format2[] = "  %s PTS DH group %N not available";
-       
+
        *dh_groups = PTS_DH_GROUP_NONE;
 
        enumerator = lib->crypto->create_dh_enumerator(lib->crypto);
index 344914f..e69c324 100644 (file)
@@ -16,7 +16,7 @@
 #include "pts_file_meas.h"
 
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include <sys/stat.h>
 #include <libgen.h>
index c97c2d7..9cca0a5 100644 (file)
@@ -16,7 +16,7 @@
 #include "pts_file_meta.h"
 
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_pts_file_meta_t private_pts_file_meta_t;
 
index fbc9c69..16a66e7 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "pts_meas_algo.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 ENUM_BEGIN(pts_meas_algorithm_names, PTS_MEAS_ALGO_NONE, PTS_MEAS_ALGO_NONE,
        "None");
@@ -43,7 +43,7 @@ bool pts_meas_algo_probe(pts_meas_algorithms_t *algorithms)
        const char *plugin_name;
        char format1[] = "  %s PTS measurement algorithm %N[%s] available";
        char format2[] = "  %s PTS measurement algorithm %N not available";
-       
+
        *algorithms = 0;
 
        enumerator = lib->crypto->create_hasher_enumerator(lib->crypto);
index a7a2f5f..0af93b6 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "pts_pcr.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 #include <stdarg.h>
 
index 75f3f17..d5bbdc9 100644 (file)
@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tcg_pts_attr_aik_t private_tcg_pts_attr_aik_t;
 
@@ -57,7 +57,7 @@ struct private_tcg_pts_attr_aik_t {
         * Attribute value
         */
        chunk_t value;
-       
+
        /**
         * Noskip flag
         */
@@ -135,7 +135,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
        u_int8_t flags;
        certificate_type_t type;
        chunk_t aik_blob;
-       
+
        if (this->value.len < PTS_AIK_SIZE)
        {
                DBG1(DBG_TNC, "insufficient data for Attestation Identity Key");
index 3ca255c..4d72812 100644 (file)
@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tcg_pts_attr_dh_nonce_finish_t
                                        private_tcg_pts_attr_dh_nonce_finish_t;
@@ -36,7 +36,7 @@ typedef struct private_tcg_pts_attr_dh_nonce_finish_t
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  *  |                                          D-H Initiator Nonce ...                                 |
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  
+ *
  */
 
 #define PTS_DH_NONCE_FINISH_SIZE                       12
@@ -66,7 +66,7 @@ struct private_tcg_pts_attr_dh_nonce_finish_t {
         * Noskip flag
         */
        bool noskip_flag;
-       
+
        /**
         * Selected Hashing Algorithm
         */
@@ -127,7 +127,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer->write_uint16(writer, this->hash_algo);
        writer->write_data  (writer, this->initiator_value);
        writer->write_data  (writer, this->initiator_nonce);
-       
+
        this->value = chunk_clone(writer->get_buf(writer));
        writer->destroy(writer);
 }
index 828c096..7796dba 100644 (file)
@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tcg_pts_attr_dh_nonce_params_req_t
                                        private_tcg_pts_attr_dh_nonce_params_req_t;
@@ -32,7 +32,7 @@ typedef struct private_tcg_pts_attr_dh_nonce_params_req_t
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  *  |  Reserved  | Min. Nonce Len |            D-H Group Set                   |
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  
+ *
  */
 
 #define PTS_DH_NONCE_PARAMS_REQ_SIZE                   4
@@ -62,7 +62,7 @@ struct private_tcg_pts_attr_dh_nonce_params_req_t {
         * Noskip flag
         */
        bool noskip_flag;
-       
+
        /**
         * Minimum acceptable length of nonce
         */
@@ -116,7 +116,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer->write_uint8 (writer, PTS_DH_NONCE_PARAMS_REQ_RESERVED);
        writer->write_uint8 (writer, this->min_nonce_len);
        writer->write_uint16(writer, this->dh_groups);
-       
+
        this->value = chunk_clone(writer->get_buf(writer));
        writer->destroy(writer);
 }
index 66ac185..1e82e70 100644 (file)
@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tcg_pts_attr_dh_nonce_params_resp_t
                                        private_tcg_pts_attr_dh_nonce_params_resp_t;
@@ -38,7 +38,7 @@ typedef struct private_tcg_pts_attr_dh_nonce_params_resp_t
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  *  |                                  D-H Responder Public Value ...                          |
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  
+ *
  */
 
 #define PTS_DH_NONCE_PARAMS_RESP_SIZE                  16
@@ -68,7 +68,7 @@ struct private_tcg_pts_attr_dh_nonce_params_resp_t {
         * Noskip flag
         */
        bool noskip_flag;
-       
+
        /**
         * Selected Diffie Hellman group
         */
@@ -135,7 +135,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer->write_uint16(writer, this->hash_algo_set);
        writer->write_data  (writer, this->responder_nonce);
        writer->write_data  (writer, this->responder_value);
-       
+
        this->value = chunk_clone(writer->get_buf(writer));
        writer->destroy(writer);
 }
index 8138a5f..3cc13be 100644 (file)
@@ -19,7 +19,7 @@
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tcg_pts_attr_file_meas_t private_tcg_pts_attr_file_meas_t;
 
index 5eac5ec..9103e06 100644 (file)
@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tcg_pts_attr_gen_attest_evid_t
                                        private_tcg_pts_attr_gen_attest_evid_t;
@@ -33,7 +33,7 @@ typedef struct private_tcg_pts_attr_gen_attest_evid_t
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  *  |                                             Reserved                                                             |
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  
+ *
  */
 
 #define PTS_GEN_ATTEST_EVID_SIZE               4
@@ -115,7 +115,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
 {
        bio_reader_t *reader;
        u_int32_t reserved;
-       
+
        if (this->value.len < PTS_GEN_ATTEST_EVID_SIZE)
        {
                DBG1(DBG_TNC, "insufficient data for Generate Attestation Evidence");
index 4b5eae7..6f35f54 100644 (file)
@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tcg_pts_attr_get_aik_t private_tcg_pts_attr_get_aik_t;
 
@@ -112,7 +112,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
 {
        bio_reader_t *reader;
        u_int32_t reserved;
-       
+
        if (this->value.len < PTS_GET_AIK_SIZE)
        {
                DBG1(DBG_TNC, "insufficient data for Get AIK");
index 0cfc7ef..4dd64e3 100644 (file)
@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tcg_pts_attr_get_tpm_version_info_t
                                        private_tcg_pts_attr_get_tpm_version_info_t;
@@ -33,7 +33,7 @@ typedef struct private_tcg_pts_attr_get_tpm_version_info_t
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  *  |                                             Reserved                                                             |
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  
+ *
  */
 
 #define PTS_GET_TPM_VER_INFO_SIZE              4
@@ -115,7 +115,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
 {
        bio_reader_t *reader;
        u_int32_t reserved;
-       
+
        if (this->value.len < PTS_GET_TPM_VER_INFO_SIZE)
        {
                DBG1(DBG_TNC, "insufficient data for Get TPM Version Information");
index bb95adc..abef45b 100644 (file)
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tcg_pts_attr_meas_algo_t private_tcg_pts_attr_meas_algo_t;
 
 /**
- * PTS Measurement Algorithm 
+ * PTS Measurement Algorithm
  * see section 3.9.1 of PTS Protocol: Binding to TNC IF-M Specification
  *
  *                                        1                               2                               3
@@ -31,7 +31,7 @@ typedef struct private_tcg_pts_attr_meas_algo_t private_tcg_pts_attr_meas_algo_t
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  *  |                  Reserved                        |          Hash Algorithm Set           |
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  
+ *
  */
 
 #define PTS_MEAS_ALGO_SIZE             4
@@ -61,7 +61,7 @@ struct private_tcg_pts_attr_meas_algo_t {
         * Noskip flag
         */
        bool noskip_flag;
-       
+
        /**
         * Set of algorithms
         */
index 83665ff..3608832 100644 (file)
@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tcg_pts_attr_proto_caps_t private_tcg_pts_attr_proto_caps_t;
 
@@ -31,7 +31,7 @@ typedef struct private_tcg_pts_attr_proto_caps_t private_tcg_pts_attr_proto_caps
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  *  |                                          Reserved                                          |C|V|D|T|X|
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  
+ *
  */
 
 #define PTS_PROTO_CAPS_SIZE                    4
@@ -61,7 +61,7 @@ struct private_tcg_pts_attr_proto_caps_t {
         * Noskip flag
         */
        bool noskip_flag;
-       
+
        /**
         * Set of flags
         */
@@ -109,7 +109,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer = bio_writer_create(PTS_PROTO_CAPS_SIZE);
        writer->write_uint16(writer, PTS_PROTO_CAPS_RESERVED);
        writer->write_uint16(writer, this->flags);
-       
+
        this->value = chunk_clone(writer->get_buf(writer));
        writer->destroy(writer);
 }
index 65bdff5..c28a40f 100644 (file)
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tcg_pts_attr_req_file_meas_t private_tcg_pts_attr_req_file_meas_t;
 
 /**
  * Request File Measurement
  * see section 3.19.1 of PTS Protocol: Binding to TNC IF-M Specification
- * 
+ *
  *                                        1                               2                               3
  *   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@@ -62,12 +62,12 @@ struct private_tcg_pts_attr_req_file_meas_t {
         * Attribute value
         */
        chunk_t value;
-       
+
        /**
         * Noskip flag
         */
        bool noskip_flag;
-       
+
        /**
         * Directory Contents flag
         */
@@ -77,12 +77,12 @@ struct private_tcg_pts_attr_req_file_meas_t {
         * Request ID
         */
        u_int16_t request_id;
-       
+
        /**
         * UTF8 Encoding of Delimiter Character
         */
        u_int32_t delimiter;
-       
+
        /**
         * Fully Qualified File Pathname
         */
@@ -124,7 +124,7 @@ METHOD(pa_tnc_attr_t, build, void,
        u_int8_t flags = PTS_REQ_FILE_MEAS_NO_FLAGS;
        chunk_t pathname;
        bio_writer_t *writer;
-       
+
        if (this->value.ptr)
        {
                return;
@@ -152,7 +152,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
        u_int8_t flags;
        u_int8_t reserved;
        chunk_t pathname;
-       
+
        if (this->value.len < PTS_REQ_FILE_MEAS_SIZE)
        {
                DBG1(DBG_TNC, "insufficient data for Request File Measurement");
index eb51141..0ab8bef 100644 (file)
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tcg_pts_attr_req_file_meta_t private_tcg_pts_attr_req_file_meta_t;
 
 /**
  * Request File Metadata
  * see section 3.17.1 of PTS Protocol: Binding to TNC IF-M Specification
- * 
+ *
  *                                        1                               2                               3
  *   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@@ -60,22 +60,22 @@ struct private_tcg_pts_attr_req_file_meta_t {
         * Attribute value
         */
        chunk_t value;
-       
+
        /**
         * Noskip flag
         */
        bool noskip_flag;
-       
+
        /**
         * Directory Contents flag
         */
        bool directory_flag;
-       
+
        /**
         * UTF8 Encoding of Delimiter Character
         */
        u_int8_t delimiter;
-       
+
        /**
         * Fully Qualified File Pathname
         */
@@ -117,7 +117,7 @@ METHOD(pa_tnc_attr_t, build, void,
        u_int8_t flags = PTS_REQ_FILE_META_NO_FLAGS;
        chunk_t pathname;
        bio_writer_t *writer;
-       
+
        if (this->value.ptr)
        {
                return;
@@ -132,7 +132,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer->write_uint8 (writer, flags);
        writer->write_uint8 (writer, this->delimiter);
        writer->write_uint16(writer, PTS_REQ_FILE_META_RESERVED);
-       
+
        writer->write_data  (writer, pathname);
        this->value = chunk_clone(writer->get_buf(writer));
        writer->destroy(writer);
@@ -145,7 +145,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
        u_int8_t flags;
        u_int16_t reserved;
        chunk_t pathname;
-       
+
        if (this->value.len < PTS_REQ_FILE_META_SIZE)
        {
                DBG1(DBG_TNC, "insufficient data for Request File Metadata");
@@ -157,7 +157,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
        reader->read_uint8 (reader, &flags);
        reader->read_uint8 (reader, &this->delimiter);
        reader->read_uint16(reader, &reserved);
-       
+
        reader->read_data  (reader, reader->remaining(reader), &pathname);
 
        this->directory_flag = (flags & DIRECTORY_CONTENTS_FLAG) !=
index 3781683..8bb43ae 100644 (file)
@@ -19,7 +19,7 @@
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tcg_pts_attr_req_func_comp_evid_t private_tcg_pts_attr_req_func_comp_evid_t;
 
index 387f4a1..c4f9678 100644 (file)
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include <time.h>
 
 typedef struct private_tcg_pts_attr_simple_comp_evid_t private_tcg_pts_attr_simple_comp_evid_t;
 
 /**
- * Simple Component Evidence 
+ * Simple Component Evidence
  * see section 3.15.1 of PTS Protocol: Binding to TNC IF-M Specification
- * 
+ *
  *                                        1                               2                               3
  *   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@@ -66,7 +66,7 @@ typedef struct private_tcg_pts_attr_simple_comp_evid_t private_tcg_pts_attr_simp
  */
 
 /**
- * Specific Functional Component -> Component Functional Name Structure 
+ * Specific Functional Component -> Component Functional Name Structure
  * see section 5.1 of PTS Protocol: Binding to TNC IF-M Specification
  *
  *                                        1                               2                               3
@@ -108,12 +108,12 @@ struct private_tcg_pts_attr_simple_comp_evid_t {
         * Attribute value
         */
        chunk_t value;
-       
+
        /**
         * Noskip flag
         */
        bool noskip_flag;
-       
+
        /**
         * PTS Component Evidence
         */
@@ -184,7 +184,7 @@ METHOD(pa_tnc_attr_t, build, void,
        pts_comp_evid_validation_t validation;
        time_t measurement_time;
        chunk_t measurement, utc_time, pcr_before, pcr_after;
-       
+
        if (this->value.ptr)
        {
                return;
@@ -200,7 +200,7 @@ METHOD(pa_tnc_attr_t, build, void,
                                                        &pcr_before, &pcr_after);
        validation   = this->evidence->get_validation(this->evidence,
                                                        &policy_uri);
-       
+
        /* Determine the flags to set*/
        flags = validation;
        if (has_pcr_info)
@@ -208,7 +208,7 @@ METHOD(pa_tnc_attr_t, build, void,
                flags |= PTS_SIMPLE_COMP_EVID_FLAG_PCR;
        }
 
-       utc_time = chunk_create(utc_time_buf, PTS_SIMPLE_COMP_EVID_MEAS_TIME_SIZE);     
+       utc_time = chunk_create(utc_time_buf, PTS_SIMPLE_COMP_EVID_MEAS_TIME_SIZE);
        measurement_time_to_utc(measurement_time, &utc_time);
 
        writer = bio_writer_create(PTS_SIMPLE_COMP_EVID_SIZE);
@@ -224,7 +224,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer->write_uint8 (writer, transform);
        writer->write_uint8 (writer, PTS_SIMPLE_COMP_EVID_RESERVED);
        writer->write_data  (writer, utc_time);
-       
+
        /* Optional fields */
        if (validation == PTS_COMP_EVID_VALIDATION_FAILED ||
                validation == PTS_COMP_EVID_VALIDATION_PASSED)
@@ -241,7 +241,7 @@ METHOD(pa_tnc_attr_t, build, void,
        }
 
        writer->write_data(writer, measurement);
-       
+
        this->value = chunk_clone(writer->get_buf(writer));
        writer->destroy(writer);
 }
@@ -250,7 +250,7 @@ static const int days[] = { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 33
 static const int tm_leap_1970 = 477;
 
 /**
- * Convert Simple Component Evidence UTS string format to time_t  
+ * Convert Simple Component Evidence UTS string format to time_t
  */
 bool measurement_time_from_utc(time_t *measurement_time, chunk_t utc_time)
 {
@@ -314,7 +314,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
                return FAILED;
        }
        reader = bio_reader_create(this->value);
-       
+
        reader->read_uint8 (reader, &flags);
        reader->read_uint24(reader, &depth);
        reader->read_uint24(reader, &vendor_id);
@@ -364,7 +364,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
                }
                has_validation = TRUE;
        }
-       
+
        /*  Are optional PCR value fields included? */
        if (flags & PTS_SIMPLE_COMP_EVID_FLAG_PCR)
        {
@@ -389,11 +389,11 @@ METHOD(pa_tnc_attr_t, process, status_t,
                has_pcr_info = TRUE;
        }
 
-       /* Measurement field comes at the very end */ 
+       /* Measurement field comes at the very end */
        reader->read_data(reader,reader->remaining(reader), &measurement);
        reader->destroy(reader);
 
-       /* Create Component Functional Name object */   
+       /* Create Component Functional Name object */
        name = pts_comp_func_name_create(vendor_id, comp_name, qualifier);
 
        /* Create Component Evidence object */
@@ -457,7 +457,7 @@ METHOD(tcg_pts_attr_simple_comp_evid_t, get_comp_evidence, pts_comp_evidence_t*,
 pa_tnc_attr_t *tcg_pts_attr_simple_comp_evid_create(pts_comp_evidence_t *evid)
 {
        private_tcg_pts_attr_simple_comp_evid_t *this;
-       
+
        INIT(this,
                .public = {
                        .pa_tnc_attribute = {
index 8d2d4f8..8c76651 100644 (file)
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tcg_pts_attr_simple_evid_final_t private_tcg_pts_attr_simple_evid_final_t;
 
 /**
  * Simple Evidence Final
  * see section 3.15.2 of PTS Protocol: Binding to TNC IF-M Specification
- * 
+ *
  *                                        1                               2                               3
  *   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@@ -66,7 +66,7 @@ struct private_tcg_pts_attr_simple_evid_final_t {
         * Attribute value
         */
        chunk_t value;
-       
+
        /**
         * Noskip flag
         */
@@ -81,22 +81,22 @@ struct private_tcg_pts_attr_simple_evid_final_t {
         * Optional Composite Hash Algorithm
         */
        pts_meas_algorithms_t comp_hash_algorithm;
-       
+
        /**
         * Optional TPM PCR Composite
         */
        chunk_t pcr_comp;
-       
+
        /**
         * Optional TPM Quote Signature
         */
        chunk_t tpm_quote_sig;
-       
+
        /**
         * Is Evidence Signature included?
         */
        bool has_evid_sig;
-       
+
        /**
         * Optional Evidence Signature
         */
@@ -157,7 +157,7 @@ METHOD(pa_tnc_attr_t, build, void,
 {
        bio_writer_t *writer;
        u_int8_t flags;
-       
+
        if (this->value.ptr)
        {
                return;
@@ -172,7 +172,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer = bio_writer_create(PTS_SIMPLE_EVID_FINAL_SIZE);
        writer->write_uint8 (writer, flags);
        writer->write_uint8 (writer, PTS_SIMPLE_EVID_FINAL_RESERVED);
-       
+
        /** Optional Composite Hash Algorithm field is always present
         * Field has value of all zeroes if not used.
         * Implemented adhering the suggestion of Paul Sangster 28.Oct.2011
@@ -193,7 +193,7 @@ METHOD(pa_tnc_attr_t, build, void,
        {
                writer->write_data (writer, this->evid_sig);
        }
-       
+
        this->value = chunk_clone(writer->get_buf(writer));
        writer->destroy(writer);
 }
@@ -206,7 +206,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
        u_int16_t algorithm;
        u_int32_t pcr_comp_len, tpm_quote_sig_len, evid_sig_len;
        status_t status = FAILED;
-       
+
        if (this->value.len < PTS_SIMPLE_EVID_FINAL_SIZE)
        {
                DBG1(DBG_TNC, "insufficient data for Simple Evidence Final");
@@ -214,7 +214,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
                return FAILED;
        }
        reader = bio_reader_create(this->value);
-       
+
        reader->read_uint8(reader, &flags);
        reader->read_uint8(reader, &reserved);
 
@@ -226,10 +226,10 @@ METHOD(pa_tnc_attr_t, process, status_t,
         * Field has value of all zeroes if not used.
         * Implemented adhering the suggestion of Paul Sangster 28.Oct.2011
         */
-       
+
        reader->read_uint16(reader, &algorithm);
        this->comp_hash_algorithm = algorithm;
-       
+
        /*  Optional Composite Hash Algorithm and TPM PCR Composite fields */
        if (this->flags != PTS_SIMPLE_EVID_FINAL_NO)
        {
@@ -246,7 +246,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
                        goto end;
                }
                this->pcr_comp = chunk_clone(this->pcr_comp);
-               
+
                if (!reader->read_uint32(reader, &tpm_quote_sig_len))
                {
                        DBG1(DBG_TNC, "insufficient data for PTS Simple Evidence Final "
@@ -261,7 +261,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
                }
                this->tpm_quote_sig = chunk_clone(this->tpm_quote_sig);
        }
-       
+
        /*  Optional Evidence Signature field */
        if (this->has_evid_sig)
        {
@@ -269,7 +269,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
                reader->read_data(reader, evid_sig_len, &this->evid_sig);
                this->evid_sig = chunk_clone(this->evid_sig);
        }
-       
+
        reader->destroy(reader);
        return SUCCESS;
 
index 8d1e78f..5143e16 100644 (file)
@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tcg_pts_attr_tpm_version_info_t private_tcg_pts_attr_tpm_version_info_t;
 
@@ -62,7 +62,7 @@ struct private_tcg_pts_attr_tpm_version_info_t {
         * Noskip flag
         */
        bool noskip_flag;
-       
+
        /**
         * TPM Version Information
         */
@@ -118,7 +118,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
        private_tcg_pts_attr_tpm_version_info_t *this, u_int32_t *offset)
 {
        bio_reader_t *reader;
-       
+
        if (this->value.len < PTS_TPM_VER_INFO_SIZE)
        {
                DBG1(DBG_TNC, "insufficient data for TPM Version Information");
index 51088e6..9e15f3c 100644 (file)
@@ -19,7 +19,7 @@
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tcg_pts_attr_file_meta_t private_tcg_pts_attr_file_meta_t;
 
index 442cb12..1478c3d 100644 (file)
@@ -19,7 +19,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <networking/host.h>
 #include <collections/linked_list.h>
 #include <threading/condvar.h>
index 77f9b03..059dcda 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "radius_message.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <crypto/hashers/hasher.h>
 
 typedef struct private_radius_message_t private_radius_message_t;
index ba7cb14..7dab968 100644 (file)
@@ -20,7 +20,7 @@
 #include <unistd.h>
 
 #include <pen/pen.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_radius_socket_t private_radius_socket_t;
 
index 92db193..8b47198 100644 (file)
@@ -17,7 +17,7 @@
 
 #include "simaka_manager.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 /** length of the k_encr key */
 #define KENCR_LEN 16
index e10ab21..e85dd66 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "simaka_manager.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 #include <threading/rwlock.h>
 
index e7c7a0a..7dd1548 100644 (file)
@@ -17,7 +17,7 @@
 
 #include "simaka_manager.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 
 typedef struct private_simaka_message_t private_simaka_message_t;
index 3d01b2a..f024f2c 100644 (file)
@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
 
 # copy-n-paste from Makefile.am
 LOCAL_SRC_FILES := \
-library.c debug.c settings.c \
+library.c settings.c \
 asn1/asn1.c asn1/asn1_parser.c asn1/oid.c bio/bio_reader.c bio/bio_writer.c \
 collections/blocking_queue.c collections/enumerator.c collections/hashtable.c \
 collections/linked_list.c \
@@ -30,8 +30,9 @@ pen/pen.c plugins/plugin_loader.c plugins/plugin_feature.c processing/jobs/job.c
 processing/jobs/callback_job.c processing/processor.c processing/scheduler.c \
 selectors/traffic_selector.c threading/thread.c threading/thread_value.c \
 threading/mutex.c threading/semaphore.c threading/rwlock.c threading/spinlock.c \
-utils.c utils/chunk.c utils/enum.c utils/identification.c utils/lexparser.c \
-utils/optionsfrom.c utils/capabilities.c utils/backtrace.c utils/printf_hook.c
+utils.c utils/chunk.c utils/debug.c utils/enum.c utils/identification.c \
+utils/lexparser.c utils/optionsfrom.c utils/capabilities.c utils/backtrace.c \
+utils/printf_hook.c
 
 # adding the plugin source files
 
index 153f6c9..205cb64 100644 (file)
@@ -1,7 +1,7 @@
 ipseclib_LTLIBRARIES = libstrongswan.la
 
 libstrongswan_la_SOURCES = \
-library.c debug.c settings.c \
+library.c settings.c \
 asn1/asn1.c asn1/asn1_parser.c asn1/oid.c bio/bio_reader.c bio/bio_writer.c \
 collections/blocking_queue.c collections/enumerator.c collections/hashtable.c \
 collections/linked_list.c \
@@ -28,13 +28,14 @@ pen/pen.c plugins/plugin_loader.c plugins/plugin_feature.c processing/jobs/job.c
 processing/jobs/callback_job.c processing/processor.c processing/scheduler.c \
 selectors/traffic_selector.c threading/thread.c threading/thread_value.c \
 threading/mutex.c threading/semaphore.c threading/rwlock.c threading/spinlock.c \
-utils.c utils/chunk.c utils/enum.c utils/identification.c utils/lexparser.c \
-utils/optionsfrom.c utils/capabilities.c utils/backtrace.c utils/printf_hook.c
+utils.c utils/chunk.c utils/debug.c utils/enum.c utils/identification.c \
+utils/lexparser.c utils/optionsfrom.c utils/capabilities.c utils/backtrace.c \
+utils/printf_hook.c
 
 if USE_DEV_HEADERS
 strongswan_includedir = ${dev_headers}
 nobase_strongswan_include_HEADERS = \
-library.h debug.h settings.h \
+library.h settings.h \
 asn1/asn1.h asn1/asn1_parser.h asn1/oid.h bio/bio_reader.h bio/bio_writer.h \
 collections/blocking_queue.h collections/enumerator.h collections/hashtable.h \
 collections/linked_list.h \
@@ -68,8 +69,8 @@ processing/scheduler.h selectors/traffic_selector.h \
 threading/thread.h threading/thread_value.h \
 threading/mutex.h threading/condvar.h threading/spinlock.h threading/semaphore.h \
 threading/rwlock.h threading/rwlock_condvar.h threading/lock_profiler.h \
-utils.h utils/chunk.h utils/enum.h utils/identification.h utils/lexparser.h \
-utils/optionsfrom.h utils/capabilities.h utils/backtrace.h \
+utils.h utils/chunk.h utils/debug.h utils/enum.h utils/identification.h \
+utils/lexparser.h utils/optionsfrom.h utils/capabilities.h utils/backtrace.h \
 utils/leak_detective.h utils/printf_hook.h utils/integrity_checker.h
 endif
 
index c9f6fce..f438cb2 100644 (file)
@@ -19,7 +19,7 @@
 #include <string.h>
 #include <time.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "oid.h"
 #include "asn1.h"
index 40e11b3..c31fb75 100644 (file)
@@ -19,7 +19,7 @@
 #include <string.h>
 #include <time.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "asn1.h"
 #include "asn1_parser.h"
index 3a62bb5..17815d6 100644 (file)
@@ -18,7 +18,7 @@
 
 #include "bio_reader.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_bio_reader_t private_bio_reader_t;
 
index 53c94f9..f80cdab 100644 (file)
@@ -25,7 +25,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 /**
  * Implementation of enumerator_create_empty().enumerate
index 9d17143..a718de3 100644 (file)
@@ -17,7 +17,7 @@
 #include "auth_cfg.h"
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 #include <utils/identification.h>
 #include <eap/eap.h>
index 33ba4e9..bc4209c 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "certificate.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <credentials/certificates/x509.h>
 
 ENUM(certificate_type_names, CERT_ANY, CERT_PLUTO_CRL,
index 69bd80b..09fd0bf 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "crl.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 ENUM(crl_reason_names, CRL_REASON_UNSPECIFIED, CRL_REASON_REMOVE_FROM_CRL,
        "unspecified",
index cb52b41..71a3f9e 100644 (file)
@@ -17,7 +17,7 @@
 
 #include "credential_factory.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 #include <threading/thread_value.h>
 #include <threading/rwlock.h>
index 32dadc7..9e40c5a 100644 (file)
@@ -16,7 +16,7 @@
 #include "credential_manager.h"
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/thread_value.h>
 #include <threading/mutex.h>
 #include <threading/rwlock.h>
index 2cef233..46bfb5c 100644 (file)
@@ -15,7 +15,7 @@
  */
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "auth_cfg_wrapper.h"
 
index 02fb8d5..32a0e67 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "aead.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_aead_t private_aead_t;
 
index 48300b0..5a363e9 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "crypto_factory.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/rwlock.h>
 #include <collections/linked_list.h>
 #include <crypto/crypto_tester.h>
index 56f0ded..08b2264 100644 (file)
@@ -20,7 +20,7 @@
 
 #include "crypto_tester.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 
 typedef struct private_crypto_tester_t private_crypto_tester_t;
index 674fe04..6876035 100644 (file)
@@ -20,7 +20,7 @@
 #include <time.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include <asn1/oid.h>
 #include <asn1/asn1.h>
index f3cc5d2..73dfdc4 100644 (file)
@@ -15,7 +15,7 @@
  */
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include <asn1/oid.h>
 #include <asn1/asn1.h>
diff --git a/src/libstrongswan/debug.c b/src/libstrongswan/debug.c
deleted file mode 100644 (file)
index e8c9e6b..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2006 Martin Willi
- * 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 <stdarg.h>
-
-#include "debug.h"
-
-ENUM(debug_names, DBG_DMN, DBG_LIB,
-       "DMN",
-       "MGR",
-       "IKE",
-       "CHD",
-       "JOB",
-       "CFG",
-       "KNL",
-       "NET",
-       "ASN",
-       "ENC",
-       "TNC",
-       "IMC",
-       "IMV",
-       "PTS",
-       "TLS",
-       "APP",
-       "ESP",
-       "LIB",
-);
-
-ENUM(debug_lower_names, DBG_DMN, DBG_LIB,
-       "dmn",
-       "mgr",
-       "ike",
-       "chd",
-       "job",
-       "cfg",
-       "knl",
-       "net",
-       "asn",
-       "enc",
-       "tnc",
-       "imc",
-       "imv",
-       "pts",
-       "tls",
-       "app",
-       "esp",
-       "lib",
-);
-
-/**
- * level logged by the default logger
- */
-static level_t default_level = 1;
-
-/**
- * stream logged to by the default logger
- */
-static FILE *default_stream = NULL;
-
-/**
- * default dbg function which printf all to stderr
- */
-void dbg_default(debug_t group, level_t level, char *fmt, ...)
-{
-       if (!default_stream)
-       {
-               default_stream = stderr;
-       }
-       if (level <= default_level)
-       {
-               va_list args;
-
-               va_start(args, fmt);
-               vfprintf(default_stream, fmt, args);
-               fprintf(default_stream, "\n");
-               va_end(args);
-       }
-}
-
-/**
- * set the level logged by the default stderr logger
- */
-void dbg_default_set_level(level_t level)
-{
-       default_level = level;
-}
-
-/**
- * set the stream logged by dbg_default() to
- */
-void dbg_default_set_stream(FILE *stream)
-{
-       default_stream = stream;
-}
-
-/**
- * The registered debug hook.
- */
-void (*dbg) (debug_t group, level_t level, char *fmt, ...) = dbg_default;
-
diff --git a/src/libstrongswan/debug.h b/src/libstrongswan/debug.h
deleted file mode 100644 (file)
index 337dfd9..0000000
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (C) 2006 Martin Willi
- * 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 debug debug
- * @{ @ingroup libstrongswan
- */
-
-#ifndef DEBUG_H_
-#define DEBUG_H_
-
-typedef enum debug_t debug_t;
-typedef enum level_t level_t;
-
-#include <stdio.h>
-
-#include "utils/enum.h"
-
-/**
- * Debug message group.
- */
-enum debug_t {
-       /** daemon specific */
-       DBG_DMN,
-       /** IKE_SA_MANAGER */
-       DBG_MGR,
-       /** IKE_SA */
-       DBG_IKE,
-       /** CHILD_SA */
-       DBG_CHD,
-       /** job processing */
-       DBG_JOB,
-       /** configuration backends */
-       DBG_CFG,
-       /** kernel interface */
-       DBG_KNL,
-       /** networking/sockets */
-       DBG_NET,
-       /** low-level encoding/decoding (ASN.1, X.509 etc.) */
-       DBG_ASN,
-       /** message encoding/decoding */
-       DBG_ENC,
-       /** trusted network connect */
-       DBG_TNC,
-       /** integrity measurement client */
-       DBG_IMC,
-       /** integrity measurement verifier */
-       DBG_IMV,
-       /** platform trust service */
-       DBG_PTS,
-       /** libtls */
-       DBG_TLS,
-       /** applications other than daemons */
-       DBG_APP,
-       /** libipsec */
-       DBG_ESP,
-       /** libstrongswan */
-       DBG_LIB,
-       /** number of groups */
-       DBG_MAX,
-       /** pseudo group with all groups */
-       DBG_ANY = DBG_MAX,
-};
-
-/**
- * short names of debug message group.
- */
-extern enum_name_t *debug_names;
-
-/**
- * short names of debug message group, lower case.
- */
-extern enum_name_t *debug_lower_names;
-
-/**
- * Debug levels used to control output verbosity.
- */
-enum level_t {
-       /** absolutely silent */
-       LEVEL_SILENT = -1,
-       /** most important auditing logs */
-       LEVEL_AUDIT =   0,
-       /** control flow */
-       LEVEL_CTRL =    1,
-       /** diagnose problems */
-       LEVEL_DIAG =    2,
-       /** raw binary blobs */
-       LEVEL_RAW =     3,
-       /** including sensitive data (private keys) */
-       LEVEL_PRIVATE = 4,
-};
-
-#ifndef DEBUG_LEVEL
-# define DEBUG_LEVEL 4
-#endif /* DEBUG_LEVEL */
-
-/** debug macros, they call the dbg function hook */
-#if DEBUG_LEVEL >= 0
-# define DBG0(group, fmt, ...) dbg(group, 0, fmt, ##__VA_ARGS__)
-#endif /* DEBUG_LEVEL */
-#if DEBUG_LEVEL >= 1
-# define DBG1(group, fmt, ...) dbg(group, 1, fmt, ##__VA_ARGS__)
-#endif /* DEBUG_LEVEL */
-#if DEBUG_LEVEL >= 2
-# define DBG2(group, fmt, ...) dbg(group, 2, fmt, ##__VA_ARGS__)
-#endif /* DEBUG_LEVEL */
-#if DEBUG_LEVEL >= 3
-# define DBG3(group, fmt, ...) dbg(group, 3, fmt, ##__VA_ARGS__)
-#endif /* DEBUG_LEVEL */
-#if DEBUG_LEVEL >= 4
-# define DBG4(group, fmt, ...) dbg(group, 4, fmt, ##__VA_ARGS__)
-#endif /* DEBUG_LEVEL */
-
-#ifndef DBG0
-# define DBG0(...) {}
-#endif
-#ifndef DBG1
-# define DBG1(...) {}
-#endif
-#ifndef DBG2
-# define DBG2(...) {}
-#endif
-#ifndef DBG3
-# define DBG3(...) {}
-#endif
-#ifndef DBG4
-# define DBG4(...) {}
-#endif
-
-/** dbg function hook, uses dbg_default() by default */
-extern void (*dbg) (debug_t group, level_t level, char *fmt, ...);
-
-/** default logging function */
-void dbg_default(debug_t group, level_t level, char *fmt, ...);
-
-/** set the level logged by dbg_default() */
-void dbg_default_set_level(level_t level);
-
-/** set the stream logged by dbg_default() to */
-void dbg_default_set_stream(FILE *stream);
-
-#endif /** DEBUG_H_ @}*/
index 1e4cf11..c181c5d 100644 (file)
@@ -19,7 +19,7 @@
 
 #include "eap.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 ENUM(eap_code_names, EAP_REQUEST, EAP_FAILURE,
        "EAP_REQUEST",
index ec1b5af..a638eef 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "fetcher_manager.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/rwlock.h>
 #include <collections/linked_list.h>
 
index db0c845..2a8dda7 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <stdlib.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/thread.h>
 #include <utils/identification.h>
 #include <networking/host.h>
index 1d06140..66a8ff1 100644 (file)
@@ -18,7 +18,7 @@
 
 #include "host.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <library.h>
 
 #define IPV4_LEN        4
index c12becc..73ca332 100644 (file)
@@ -19,8 +19,8 @@
 
 #include "host_resolver.h"
 
-#include <debug.h>
 #include <library.h>
+#include <utils/debug.h>
 #include <threading/condvar.h>
 #include <threading/mutex.h>
 #include <threading/thread.h>
index 36f3359..d07327e 100644 (file)
@@ -40,7 +40,7 @@
 #include "tun_device.h"
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/thread.h>
 
 #define TUN_DEFAULT_MTU 1500
index 7fe47c5..331d1e8 100644 (file)
@@ -19,7 +19,7 @@
 #include <errno.h>
 #include <linux/socket.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_af_alg_ops_t private_af_alg_ops_t;
 
index 8d49431..42c78c1 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <library.h>
 #include <utils/chunk.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #ifndef UNIX_PATH_MAX
 #define UNIX_PATH_MAX 108
index 725d02d..c8cb7fb 100644 (file)
@@ -17,7 +17,7 @@
 
 #include "cmac.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <crypto/mac.h>
 #include <crypto/prfs/mac_prf.h>
 #include <crypto/signers/mac_signer.h>
index 5d697fd..83a7429 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "constraints_validator.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <asn1/asn1.h>
 #include <collections/linked_list.h>
 #include <credentials/certificates/x509.h>
index 7f8c0ae..c68b74f 100644 (file)
@@ -17,7 +17,7 @@
 #include <curl/curl.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "curl_fetcher.h"
 
index 8628c4b..062fe12 100644 (file)
@@ -16,7 +16,7 @@
 #include "curl_plugin.h"
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include "curl_fetcher.h"
 
 #include <curl/curl.h>
index ea4eb6c..b8a4515 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "dnskey_builder.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <credentials/keys/private_key.h>
 
 
index 3fe204d..2382507 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <arpa/inet.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_fips_prf_t private_fips_prf_t;
 
index 0b5dc03..a737cb1 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <gcrypt.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_gcrypt_crypter_t private_gcrypt_crypter_t;
 
index 0efd3ba..f418b94 100644 (file)
@@ -18,7 +18,7 @@
 
 #include "gcrypt_dh.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_gcrypt_dh_t private_gcrypt_dh_t;
 
index 3155a4a..af79931 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "gcrypt_hasher.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 #include <gcrypt.h>
 
index 5ebdceb..78d75a2 100644 (file)
@@ -23,7 +23,7 @@
 #include "gcrypt_rsa_public_key.h"
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/mutex.h>
 
 #include <errno.h>
index 9fdb2d4..938a464 100644 (file)
@@ -17,7 +17,7 @@
 
 #include "gcrypt_rsa_private_key.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <asn1/oid.h>
 #include <asn1/asn1.h>
 #include <asn1/asn1_parser.h>
index c54f2c0..291287a 100644 (file)
@@ -17,7 +17,7 @@
 
 #include "gcrypt_rsa_public_key.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <asn1/oid.h>
 #include <asn1/asn1.h>
 #include <asn1/asn1_parser.h>
index 7d232e4..b74d351 100644 (file)
@@ -21,7 +21,7 @@
 
 #include "gmp_diffie_hellman.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 #ifdef HAVE_MPZ_POWM_SEC
 # undef mpz_powm
index 590ab6c..6ecf4ec 100644 (file)
@@ -22,7 +22,7 @@
 #include "gmp_rsa_private_key.h"
 #include "gmp_rsa_public_key.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <asn1/oid.h>
 #include <asn1/asn1.h>
 #include <asn1/asn1_parser.h>
index 2d84f00..494b016 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "gmp_rsa_public_key.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <asn1/oid.h>
 #include <asn1/asn1.h>
 #include <asn1/asn1_parser.h>
index 75f9648..40b6d1f 100644 (file)
@@ -22,7 +22,7 @@
 #include <errno.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "ldap_fetcher.h"
 
index d31e1eb..7e1da68 100644 (file)
@@ -19,7 +19,7 @@
 
 #include "mysql_database.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <utils/chunk.h>
 #include <threading/thread_value.h>
 #include <threading/mutex.h>
index dd8b327..23d7097 100644 (file)
@@ -16,7 +16,7 @@
 #include "mysql_plugin.h"
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include "mysql_database.h"
 
 typedef struct private_mysql_plugin_t private_mysql_plugin_t;
index 0402e35..64ed2e0 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "nonce_nonceg.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_nonce_nonceg_t private_nonce_nonceg_t;
 
index 1956bf6..d4f36f5 100644 (file)
@@ -42,7 +42,7 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/enumerator.h>
 #include <credentials/certificates/x509.h>
 
index b27aa33..4dc5663 100644 (file)
@@ -18,7 +18,7 @@
 
 #include "openssl_diffie_hellman.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_openssl_diffie_hellman_t private_openssl_diffie_hellman_t;
 
index 9e40675..d846278 100644 (file)
@@ -23,7 +23,7 @@
 #include "openssl_ec_diffie_hellman.h"
 #include "openssl_util.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_openssl_ec_diffie_hellman_t private_openssl_ec_diffie_hellman_t;
 
index 9505045..d350d05 100644 (file)
@@ -22,7 +22,7 @@
 #include "openssl_ec_public_key.h"
 #include "openssl_util.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 #include <openssl/evp.h>
 #include <openssl/ecdsa.h>
index 9cb68a3..3f5125b 100644 (file)
@@ -21,7 +21,7 @@
 #include "openssl_ec_public_key.h"
 #include "openssl_util.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 #include <openssl/evp.h>
 #include <openssl/ecdsa.h>
index b69de98..1f7497a 100644 (file)
@@ -25,7 +25,7 @@
 #include "openssl_plugin.h"
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/thread.h>
 #include <threading/mutex.h>
 #include "openssl_util.h"
index c83244f..d3d64f5 100644 (file)
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <openssl/rand.h>
 #include <openssl/err.h>
 
index 98cd700..926e592 100644 (file)
@@ -17,7 +17,7 @@
 #include "openssl_rsa_private_key.h"
 #include "openssl_rsa_public_key.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 #include <openssl/evp.h>
 #include <openssl/rsa.h>
index 5872a81..0da5d25 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "openssl_rsa_public_key.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 #include <openssl/evp.h>
 #include <openssl/rsa.h>
index 1eb1c67..bc10dd2 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "openssl_util.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 #include <openssl/evp.h>
 #include <openssl/x509.h>
index a7c99a1..b847c0a 100644 (file)
@@ -47,7 +47,7 @@
 #include "openssl_x509.h"
 #include "openssl_util.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <asn1/oid.h>
 #include <collections/linked_list.h>
 
index 9d4afd8..b887c2c 100644 (file)
@@ -21,7 +21,7 @@
 #include <stdio.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_padlock_plugin_t private_padlock_plugin_t;
 typedef enum padlock_feature_t padlock_feature_t;
index eefb2eb..08e81b3 100644 (file)
@@ -27,7 +27,7 @@
 #include <sys/mman.h>
 #include <sys/stat.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <library.h>
 #include <utils/lexparser.h>
 #include <asn1/asn1.h>
index f358dc7..3ff3572 100644 (file)
@@ -18,7 +18,7 @@
 #include "pgp_utils.h"
 
 #include <utils/enum.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <credentials/keys/private_key.h>
 
 /**
index a99bed2..89d7094 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <time.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_pgp_cert_t private_pgp_cert_t;
 
index d16d1d7..100f3ef 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "pgp_encoder.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 /**
  * Build a PGPv3 fingerprint
index 7fd905c..bb15627 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "pgp_utils.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 ENUM_BEGIN(pgp_pubkey_alg_names, PGP_PUBKEY_ALG_RSA, PGP_PUBKEY_ALG_RSA_SIGN_ONLY,
        "RSA",
index 6d022f3..c6661fc 100644 (file)
@@ -17,7 +17,7 @@
 
 #include "pkcs1_builder.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <asn1/oid.h>
 #include <asn1/asn1.h>
 #include <asn1/asn1_parser.h>
index 9122e8d..60f0ca7 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "pkcs1_encoder.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <asn1/asn1.h>
 #include <asn1/oid.h>
 
index ef936d4..e65f3a0 100644 (file)
@@ -16,7 +16,7 @@
 #include "pkcs11_creds.h"
 #include "pkcs11_manager.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 
 typedef struct private_pkcs11_creds_t private_pkcs11_creds_t;
index c870370..2e5af95 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "pkcs11_dh.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <library.h>
 #include <asn1/asn1.h>
 #include <asn1/oid.h>
index 53a2bfc..80079b9 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <unistd.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/mutex.h>
 
 #include "pkcs11_manager.h"
index b7b2ada..7661473 100644 (file)
@@ -21,7 +21,7 @@
 #include <dlfcn.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/mutex.h>
 #include <collections/linked_list.h>
 
index 52e46d3..8bda5b6 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "pkcs11_manager.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 #include <threading/thread.h>
 
index 7760f35..9afaf12 100644 (file)
@@ -19,7 +19,7 @@
 #include "pkcs11_plugin.h"
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 #include <threading/mutex.h>
 #include <threading/rwlock.h>
index aa6e6e2..bb9cc7a 100644 (file)
@@ -22,7 +22,7 @@
 #include "pkcs11_manager.h"
 #include "pkcs11_public_key.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_pkcs11_private_key_t private_pkcs11_private_key_t;
 
index a8bfb56..0302c0e 100644 (file)
@@ -25,7 +25,7 @@
 #include <asn1/oid.h>
 #include <asn1/asn1.h>
 #include <asn1/asn1_parser.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_pkcs11_public_key_t private_pkcs11_public_key_t;
 
index 20e4b6f..d18028b 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "pkcs11_rng.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "pkcs11_manager.h"
 
index a501423..26a3620 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "pkcs8_builder.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <asn1/oid.h>
 #include <asn1/asn1.h>
 #include <asn1/asn1_parser.h>
index 6e04387..d39fa6e 100644 (file)
@@ -21,7 +21,7 @@
 
 #include "plugin_feature.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 ENUM(plugin_feature_names, FEATURE_NONE, FEATURE_CUSTOM,
        "NONE",
index 1033695..cea219e 100644 (file)
@@ -22,7 +22,7 @@
 #include <limits.h>
 #include <stdio.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <library.h>
 #include <collections/hashtable.h>
 #include <collections/linked_list.h>
index 0304ccb..95f53f9 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <time.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_pubkey_cert_t private_pubkey_cert_t;
 
index cef2004..24c711a 100644 (file)
@@ -22,7 +22,7 @@
 #include <errno.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include "random_rng.h"
 
 #ifndef DEV_RANDOM
index 52cfc08..5688448 100644 (file)
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "random_rng.h"
 #include "random_plugin.h"