]> git.ipfire.org Git - thirdparty/strongswan.git/commitdiff
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)
306 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/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 [moved from src/libstrongswan/debug.c with 100% similarity]
src/libstrongswan/utils/debug.h [moved from src/libstrongswan/debug.h with 99% similarity]
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 629a8eabb3420ea0a0b7dd86c91b4a865e63bd2c..588807597cf6a429eceac64701e709c5cd0b84b4 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 ad50d0cd666d4fb893bfdf21f3f9819b2ea9deba..23f8572468eb388efc5b74ffc3dc29d8daecdd06 100644 (file)
@@ -17,7 +17,7 @@
 #include <unistd.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 static int count = 0;
 
index 5b63381b8438bcfb4b308dff30ff8e6a2338a182..aba96a8c1164073c196e7a5154335ba644921a3d 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 7cad4c45eb9306cb8020ab02e09d44fbc2b4569d..26427ab3d297460eb48a25e80409e6edb91281b8 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 6402e606daeb1626d18455c80cdc9512fc9c6f74..32c6e8f49c95cb22b977e942b67d26f862be6f61 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 3bdb345298b78bb908250951783352fb649237b6..d0d259e60041ff411c69175e1e83567c01371633 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 3f4fdce9fc5d22306eac9779a6286becc9ec1382..d00e49b3ea82fec7e47827516eaf7a77a02bc891 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 a6152bf25601c1aea62c8dfe5808df000c4744c5..28c62c217ce197e479b6f747697a311f4d83dbdb 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 4d0ca9bc211d2b0dab1eebbff171238c82d9c0c4..cc4f5a16bb51ebabbfd0e68565239b7500cfbd6f 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 4c6a1484d220f99eeb67df6b9dd707ce57cfd026..7c7d65acd058bc10b8e17f5d0e17c58e4e5ff2f6 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 752d3075fa280c138d2ef144268ad71525e360e2..8e74ca6291647c520c80913cf1a127cfe9bf5933 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 7ac3b71601542759313a8c5273107154b792ff2d..3e7b010b3f1b8f73ea89486e2300fe6ed35c7ab3 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 40045cc3ae92f7e1896eaa5174d135354ace43bb..54c4fe395be6d214059fd4538e13d8a9146c7394 100644 (file)
@@ -25,7 +25,7 @@
 #include <errno.h>
 #include <sys/un.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "mconsole.h"
 
index f9e96a76c023b913794074037899d31ed16e8773..bf6073fef5adebc03d682c71e135723aa4f8e4c4 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 3ed3d75a97852cd9c1e9ce11552f9822947c4a69..38bbb4755e0c214ad4a8c73f4b7653e6ab73928a 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 85fe5d4c1f9d3acf1be08d3797ca81ffe4917512..dc272e6fff5e57988ee71ca1c6278948fbddfb60 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 430c95bc84af903e10adc3dd757e0c85f4f1ea4e..032fe208649f73bcb56e0f730ed8c4ce7c0d2bbe 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 9c97fbb14354cd522b1b00016aaead715106c298..17bde6a844ef193d93e329bf8d246315f69c35c1 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 6ff7325208a4a87d9aaf7c43316007dd5653055e..c95b335dc1d949585e3192feda5cca8adaa4db89 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 485b1dc6acadbed79ad57e338b6d2d311de36f62..8a6382f880b3a00531ae4fcbab6ff40062cc1e2c 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 1b07378f73bba54e8885e79f68a3456acce1f70f..65f4ed08c0d63ca9e0e2e6f4007c3809ad4007d6 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 e8cd4bfd8f330922153bafd6420aa5db6e28b5a0..5f2fd7ca4183858f168c28c6302c547bc243741e 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 1b912171a94374f4d24a809b85584a00311a786e..e339b80042b83918333e89fc0ba74c8fb79a6268 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 10f6ec11c438508951d4de93862baaf30522b4b7..f7f634a53d52c42f3ca53e513e0bd2c429bff2e1 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 79fd667cb73ee8cfb1c8c9fb7c667d61ae7d2b07..f482c5b5476e725bfc0fa92f43b4a144b50e1b56 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 0e80465010016da0f157c35d4c852f6452d43234..5237cb62cfc80ec7b7783840f9d82455e0a1038a 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 32225d2e0a194900ddb3ba99b87cc3cd9efcf439..3c63e82a971056253202016a31e06d0cbf760a56 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 7efc0fec554d35b993c0c9f879d776cc9d3d3be4..ffa1bae39421f783b4bdb2bb1ec603505b1f3675 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 0d531c43703b47b55f2c8ecb237cfe560fb5cd1d..47e0f8afb653d6b11e2fd9cb8bcaa06792341cd7 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 00a4da3f82a647cfeff4a320db09b734836f5d0b..66c9deed8383fb922b63c64028320c2040d78589 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 1418d6a4d192d9f5ee06830e05fdcf96a8f3eba2..464de17ba57184b7664f0d7d8f5313643eba87c2 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 eac285ca3defb5f9f0178a01dfcd1f3200076c92..9cd1ec381b3f0d98943d4373ba0c284c0424e576 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 6465f509607b1b60acb57e013825a0dce3edbfb8..33480bb85aa9a84975b667b9c29acc4a8b257b45 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 d8e9d0995da1c234e951af0b9b0beede36d7c3ec..16d822d3b4683959cd5dc82dbc168c190581fc2a 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 90a607cccd31d8688334d307288f5347f3d04c34..26a5ed2b4834231bd17983aed8cdb0b1e0adc15e 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 20ad208b77878e6a41611e2ff7c157608f2eda93..fcbeec6eb949dc5ada67a36e7e921dc544e503cd 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 e82cfc92d4770847623508deece67b9df713f666..a71ffc0e0495240c01ad06d22f241775f0dd12ac 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 dd11c500913a3d3439ae0f59423689cefa02df18..36cdb7fbbbbe4316af0f73cccfba8e2b9452e98b 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 0985a47a8c5103bf0332f0ff3e4f4d4e60665ea3..21b7737c315a0e047bc732040879da8e50865b33 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 11b98d8ca903e580da00ef394f96274882e3875c..b39d9cbc9cb46f28b4fc920675db83bbb8f1fe00 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 77eaa0e05d41a7031cc6fa66abad85743f3d2437..39939d34ee8d8894453c1ece196479f5b6836830 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 79aac45ed0b21d38a841d4f2a3b3f7c7adfebef6..0a960635b7d5d101a8689227adbe9db5ea2dcbce 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 2094ec5e850ec81019d661d2141a138ba65e5dd5..0b623d6ffcf486ce79ddb077d7f8b44dd3a7f78c 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 a44319ed1329274057ec3516a91bfbc3dfed003a..1e4ddc195523e0ac2d0b12597fe2e92e344c3f6e 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 1f63de32366d336ac99e2e8b18edaee694ec9ee2..b27458fde158b956924fb4c4babeedaeab8216dc 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 fa570aae9fc5c5151465b5f831a85a83342280b2..cf3e584518a04d17d6fa521e4670535c27b7ad01 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 d0df4e7ca87a5c2b09a079c18c599f12f61705cb..ba92c26b100fcd940416046d9010aca18ab8f16a 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 5a050393a5d9ce01ca763d2781949ab385190ac7..79c663905aa719193f0bbc8797b5dce1dde8f400 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 fd85350b594d34b3a660875948aee74a12e429f4..e1c193e186c5814ce621f00556f6c840a989fe68 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 af60a4b3adec0bddf33ca307003e58bafb66dc03..cf3c367d857587b6f0f7075de99329b84393a07d 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 610224242f1d5dbec7c19373cd03c0191d0707dd..32e123b2e87ec8b6ce4fd8195525ab5d80a00c14 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 b8aac30fa75b68e4ee0d80b246b2ff8f8585d6a3..fe288f01d37a2ea1d5ed04675aebfbb53f698eb1 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 56858a8b40d7a6e76a6c0fcb85ca69378920dbac..cfc29d6abdabb487b89780aa7fe38b79f2f0bb5a 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 3bf048a414ce7060bfdd898065531373891b6de5..3a2c70f5a7bb2b2a93d2a7b9f5760d68f3f8a5b2 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 974db4d7094cf82f2bf96b556bd3ed69f98cce1c..cdd0d0d0da638c6b410d84503119f88e8acfef46 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 ee06575b4238e9bc71aff5c84112974417cfed5d..4e50446be02a5ff67d22ef7187d4ffb56c25df62 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 457d3da21bcd79bf1768bb9629c4c329d7838815..d048f437cdebf3d37bc6e8f8c81470e3e2dc01d4 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 46df54486744030e14ba11c69484b0236af8f7b6..70a03cdc5be356e516ac4ea62e56d9d61329f6ae 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 bbad9bf55eef39af3d9402b5cf05e163c536130c..2d2c1316bbc2ce8015fabdbb4e1092143b4f6719 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 511b454027f76ec9758cc74879dc6cc99bba2689..935c52d7ba3e4b23b799f779498ab4b5dadc1fe2 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 c853f03a308d1498e06b39640586ea5804fbe975..63d94b94d2e59fe776a46cae4a6ea85e8dac38f2 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 5e95131a862528c6045ff372387ffdacfd332d5b..43f1854403aaddf23c478f5d97c7dd4022a410ab 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 4d917ed3924c8d4f1a13a811c31ed6c19569e4c0..8540f46b925dc7e8aeea17e5cad8fe0c0323ba83 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 b68d2dd6b698abc4d1c02debe0691645f78e9843..03795a947eb18e8e39845cf9480c114777d255b4 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 6b89635ae97326a0de4ca4081a08c9e5fc431fed..e5a02c63b9e0ee6423f90d02e5421aa9e324a2e7 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 6ca47403718dd2671f0937ecf01fe5b91cb90f3f..5d03227af604ba75ed0751281fa70d3680287dc3 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 1375c2944a1890f5e2a23ffd044047cb38aba7db..a6ca67ddcbcb72d96c76c45e636eff4299cb3f4f 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 dd3963b7fb2d8c922f2e58d32a8944c358fba4a7..5fda8b4268c520a11491a955732d893c381e87a8 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 1c5ea53deb5c83e40c0a324b6ea10e4946c06552..af53e10dec98b7b052e08608ed64fddf8a1c7989 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 7d6256598dd75124afcba2a885f2d3dec6a3e735..16fb3ab94768c611ea5f3fd514bde192aa261eac 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 79a2ab93880fcbcd8a49090422e54d352d469425..5425861155f0fbd19924a10809c3bf45a1aa5f60 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 ca3221979845cf62af215af652b290ae315a94cd..1f333d03f259afc66ed3d0c2e021b4f35e974783 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 c04ec9a01862e1057e8e41502e319f705eaddfab..69e6f7be61f3fd72f3733fd318987e2b7ab1873c 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 1d5fddbb7cbc484472176c519b6d2b45b4e0490c..f355e96e23b66568356fae21f08ba53679693de9 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 a7d90e72895196d23bbce14637931d34643beb71..1a4ee7a51b5dedc0be8b8a043a17a2119624913a 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <time.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <library.h>
 
 #include "sql_attribute.h"
index 2c1d7e9b36243344acf8537983861799e94eb7c8..431174e72e0d97aaad8181a87eea4beb59a5972f 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 8cd19a245d219935726ed6b31897d877a51d2979..f9b2634a0bcca8d497c3919e2a3ac2f1d8e0fe9b 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 b39ffa3ac810fe5338bfc542295eaa6511c0732e..8b8ab2121f75337a73badaa6b644fd5072a64d87 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 285f6c8b2c84eef4c13f3973b7fe4fe32d48d23a..561e8529de3222d446f045d37b68095e14915578 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 e1a838419139bee4bf72f31d7942b90ccdce02e0..71bdbbe2b9bb4b03883ed53c69be8b0aeee5316a 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 6d5245636341839cafe6f2db58f542c847821ad6..d45c5bb3fbff221db5e5e1b2f7f5a7477b9adf36 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 0a3094fd7c6db9fdba40ee897f9c8b0cfce88eee..6b8d6be7fe2ee530662e4f5024adcda177ac0c47 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 6893730bfb104d623508b68d49e127eb456c2716..6f77642124074f6534757746a82d6622eb012ff3 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 1b0931950bd93da814960bfb9db9c93035750d29..1c2d4f54cf4924b90ec4574c53c3710a2a4d0b12 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 4c0d7ebef0504b73fd9bf0c77e7e9a82aefc7612..08a6eedd1e9a1e2fee0e0f2310312816bdb49793 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 c7deea07cd84944fcb532271e8158e595c96ffc7..4f52206e22d61d8110d8908027747e2b22d25584 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 e0ff748f92ce777d78f214e4092f7dc5345ff9f2..c19bd920e8659bc9342c562f2542f07d342cdaab 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 7d851bb0f613fda611667c57b74b99c82b99d6d8..9c03017a7493ce97a04ad124d8876ab44e577a43 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 6c820a681197d046795cfdef4a946e29eafaa2c6..cf32190c387df30759aed82a2f3c330bc7a375b1 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 46f5d67161f57e2bf26ea3fca46c7267eb057270..e2f6fc3ab26b018d50e8e4011c8dae59cd064fc9 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 34bcf895ccb10410414748416eed56bb9fd866f8..80b77f5ec355bb8823882951557d058b705bc42f 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 719619f99db6790c018aca0997ad3dd817d46955..23aac51537e5fd04253c6c400a8949913bb7e6d0 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 7ec0b3cd87e19ba111b4b6fc613cc0c6c4f2cb53..fcb6d95cae7e0f714773d585d745489eb3ab0a0f 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 7cc3447f2a44c2fd96a8d03307a577852a1e453d..964abeb9a785280862185cb47a9518988df2dfb6 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 911a5b03a4e6940e8bfff472a7242e3c42b12d87..161623477ebb42d7e72c9fd8d26a1c75518037b9 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 48a2955750d2f35c4f5ffab43bffb3a44d3aff5b..60613d0f248f1abab79bbe59f8391926fd31f38f 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 b84548f9bc3e1a28ea2cd154d80604151d7588a7..f9de41fa7ec0e6ef245d067cff30a98233503990 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 a21fb930ec50934303e939ffe71fc26efdf8add2..d664dc9c15f01e3b3df0bfef68ea7545e8104e0f 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 e69121a4b5b93aeab2d071767653a20e05b49488..911dbfd0cafce67073fbeee732dd5ac1c3727a21 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 d43e4777b4b408cc435aeb97128fa4a096e328af..5869557066a616d03c9b25c8cd0a6b65ab30b388 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 f122256a13b0fb854f0b35f5664dd53bac328d2c..4fb60a7e13b684a9d937b424860ee49e77b3e26f 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 8846c84cd253cf14ec46ae0d099c760c5735b98a..c0661dc3856360ee5777b6f4c3e5fb00170f8589 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 3df660e01bff1cdb9d7d7ed88e99e65cb74446ae..900a55716415f751c0c3eb1bcc0e2dbca968ea0b 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 b7cdd37c28267bea6e1ef0505c7b68d049ea09f3..97d670e396bb7c39ba57c0c59e309daed272682c 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 acfa3e035195357d16c6d73b2e3f5892ffab7cb2..f50b8aa87f9f8731544c0deec1bc2dfbf56b5537 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 859e1f87f54a5bda15cd7de63be2550919233953..f49959ab9a658aab437263437876fe9567d2b4e6 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 c97dd0dea69c50cbf5d011af870a9c2dea4c51ca..5c7985e520ee9191ae9cdf3840b636dd417cd526 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 d47c4ecdf16e3247d68356d74b275bb285e23675..b5a6cdd209c3b78488c368971a7c2e5599f639b4 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 472354edca9d2f171427f6a421b3cb2e053f9a6d..87efaff7e405f1f17d450b6aca1000cd016766f1 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 fba018d1a496b1e178042f51159fa1cdbb92378b..e7beca0aa86f553ee9f21fdf09f76fab3c3140fb 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 3bfe89d2e9fdc672335dbd1da25982f2fad95a71..2346918b8b1272adc2324ba03d0c3f950f852ac3 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 1c5c781068b54d39020541fa6a1c1f6be4f15616..e36d4aeb1ac8097b34a9f371977ff671dfcdd6cc 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 4d9762cb608b62eac50da3be967853e44d6caf0b..1705d30084d5f35df2363f27e05e0e829d3f65da 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 fecc84e7015f65cf34eeca0fd013969c0ec7acd5..fbb70d73edbff0b2cc1d03d348899fa7734133c5 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 051600d4c5f8ba0e26bb1a545d107d9eaee2a931..973edad2cc64989f2e84020b5d096026f4b2b19a 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 53d4c07b3e4d0741960cfaaf9b9e8e5a5cf7245c..1fb6df8597d7b64f638e1c664ced5c8977ffc0e8 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 dc3ad3f8bf9e7f92b0386cf9a74314dadf600018..44b1117d9240c34a37170e804c3058a4f39e2be3 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 bfcab95eb5284ba648386b5082c539d828054a8d..16cc687efed58cc7f8bab378a194291fd7d809d2 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 096ca33a8fd85fda8bba7b355771215a3e466321..5c8cc2e3ef540914e2d5953caedae47a6f6ba65a 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 50d9163ea8675704cbfbbfb24dc344e3aae7baee..6c9a26acf3562fed45fea63055ed4c236a6c30e7 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 19643d5dd29b529cb0cb70ac6a0b9eff745e4df9..d7d7e82764a1b10303c58ce6f65601d3deeee6a3 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 af8ea9f9d35e4de841e90f58d93aa8e01e10ee2e..8407921acdc0b8b25443f5b28d881e1b2ed1217f 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 dd904ba39ad8460cb1a46bf013832d510c428028..72f94ec201b137849b56c676a1ca4360c8f813da 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 4d3649d4c851b3e0a30d0c45bfb80a60c1e76734..66f43a4081740d50921a41dc93a7086cf867d4ad 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 66852259c94366d60d287a6feeafef93fc409810..2ff5cff55ab69f48776b742b1e6c5077e10294f5 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 32f2cdb7369277d824a234aa1b8164b93dd8e978..28748971dbb23171b87701a6542d364f2c2a6f4c 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 384ee4ed790988c5f63f6314db94bbdbc0273c38..95110823c680572a8f1d53b36758df11f57863e5 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 9086f72634a4949bb7d7431735f90a516468d4f6..5a3b91d6d6be6931618e4fb630eb69c8862d5462 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 8ee02e4672a84d0164718b53893395131ad05c05..88d24dd885c5f244f73f234919b641f11fc08e64 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 5ff50c0bcd0b535c483a4d94d1b94ce04c25d3c4..4fcbdfa8a7d6b5745272f287b41a4c35ff98f701 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 a202d128f4088b9947e0dec3393790665af77544..a9386881766718a753ec6bfc9a7f872ab2669e55 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 e3536d1641baa719cc4941934db62a7fd433ea3a..647faf470d9183d1820158adda072abf1cb6ece3 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 2f3672445afb810ab0ab7d7de9744cbdb82f41e9..b4feec7cd4e3fe85f24f70fc3e6d7034b42d7998 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 39ba9f014d5df5e19dbd0b27ae4efb6e892a5c5d..db623f71f9c1ce75e784fbd5db691e217aa9f60f 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 d5724f6ba2204141f4caacf38d72bb1163130547..1c40f3ffad87ab4fd3b4cdf82cc89bf617132911 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 ad5d988889c218305d321181eff2f49e9a3034cc..02470f5f5b29cbb8b8c699e34c4499a8d071d2cd 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 9deeb19b5c31d94f22c24924d8f7e4dab62fd508..8fb5abddfdb641d25a762680515a3790dcf0a4b3 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 986f7ace24ce2b5c39122d044714c8f5e44508da..e3acd877467aaaa289577bee384221db09a2568c 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 0507174726c9445e3bcf36790afcb23f1e6385f6..08c3d5e9a316525b8215e22de81113453a178c8f 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 7501be044efaa34d0537e8329545f6b189612077..6c630f8fb39b4ab7f773ff45e8af1095802df856 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 40fea1cec6372d0334b5580b8e19753329856631..9c1375b79418d15d3e6b1d4e4cc4b28af19a8a00 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 7d5c7b94264ac48fa15b8f2c498a04ccd63c032a..d7537b5b1dff0109caa577465508a3e9ca15c0a1 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 5a6197bdb05f098479c4884f9aee0a1022a22510..bc483eb845f2f5bb59e6f0cc8d7219ca9c8f6f3b 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 946f37e1e0066247da69e89118b80cabf3cde205..e0778aaefbe5ffa885266b541462b4306dbb1084 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 fb141327f0568cd439cecfd86edf641211e30237..41a43603653067b3980b1852ed8d12ed42a16390 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 344914fc637226754ab1fe2b7e4c86bff971eaac..e69c32443b5c67f8588ac3a7bb6c72a50ca0d979 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 c97c2d77001fa99e8cdbde82f57b0dd0655d9613..9cca0a5a5d6826dc0ed53198c07d1e9269ca4e18 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 fbc9c69597707709b3bb894417cc7aee2f2769cc..16a66e7b32f146e1c615572b654a38f5fae9f396 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 a7a2f5fae6546ca20838e6ba3f3ec555fffeb85b..0af93b608a66ce6dcd6b2ebae3456e933a2d88f4 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "pts_pcr.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 #include <stdarg.h>
 
index 75f3f179c88f7ccfb4e5c6a5e7c77d1aed84bbfe..d5bbdc9cd2ed68edf8744bf4ab3a4a96046c9b49 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 3ca255cba90d82e905e4295e1151f55893f90e38..4d7281243bc207285d6604b66b3416715a1c5fb2 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 828c09605c9ea2d43eee3c1595465f3b63669743..7796dbaabbc2c96a11e6ce20c1543b68bde1d436 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 66ac185b32fd9c4cbacf3bee099fa9545eab168a..1e82e7098de4711898abea9dd7c23e3e6dbf8bb8 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 8138a5f2e58e4ba47b2a01ff54ad224497646961..3cc13be4a7bc7a91579447c1948a13c1e48c9b36 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 5eac5ecaed2d3d375e40f584ed85e203c737a490..9103e06b2c206f39d46fd9c378844be830a71a93 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 4b5eae7a7aab72f50071cfa2f7f2d8c2771746e2..6f35f541943618657330791f1af8024cf9480dd2 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 0cfc7efa92f3ba92f10ed868223ca5503f4d96bf..4dd64e3a7bb6f0789a039a46b16b5cd2e398a3af 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 bb95adc9e92625e5e2f479c123f4a9fe4ecddd9d..abef45bdd4d40766587cb9e9333526b805bfb9a5 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 83665ff69df5ef9a1309d910138cf8fabdddced6..360883282047d92135855830f524e7ade49b086b 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 65bdff579a4ef8689dfe55f3a018bda6cfc8a2f7..c28a40f03e270da88da6b99c00f1945222bb713a 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 eb51141722a57e81a752042844be096843f613a3..0ab8bef8341338107d3381cd3b5abe64752eeebb 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 378168375927cb3a2d41e53e601bb390be8f3fc2..8bb43aef8815a110b4fdfc4cd7d6e65a71a421ae 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 387f4a115ae53fa38f12c76d9790a32cf4512300..c4f96789a3f5b47633417079d1b31bb131a39af4 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 8d2d4f82d81f93f25e5ab29e3f6856142b8263a3..8c76651d6e80c8d98215c555229a48a8017ea57b 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 8d1e78f18d0b85afe6f0c128415ba98e0efa4b7d..5143e1676c65fb1caa681fc823c07fcd63e59da6 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 51088e62800db444b6c578383aacf0f4a201ae8a..9e15f3c170d97142a86fc444a19223572bae4aef 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 442cb12ce5f9ad106a72c9f481af423231d6453d..1478c3d9e5050817875a72ecc8710b7d08353df9 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 77f9b0398d072760c390df4304656f987236b208..059dcda4b9285791de53fce9fef23c546c5c2b8a 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 ba7cb14b0f8d0eef9df424d532c5072c465e5d3d..7dab968d8d09eef0e655c60ee62f7fe627c590df 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 92db19317a677a4e60ef2e4799d7cabc305a0f34..8b47198dfb14705d227f92c7abe330e3bb3240c9 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 e10ab21b8de0142c58a0baafc0cbce838e92cd6f..e85dd660bb0616f1d51808c8eae1be45dacefb0b 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 e7c7a0a8cf0ad97bfb2e1d2073f490f1ee7c2987..7dd15480b31ce93f015977a13d6dbadb148e21da 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 3d01b2ada2e02c6616837641a81eb3035f4485d8..f024f2cfbb1f731c168114aeb805fb25b49c5e5d 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 153f6c9d4c069fa823336d2739a7cf8fb62e7544..205cb6467e6a54c1c27517e63a84e0c547f83c88 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 c9f6fce2568348ed1bc2db355d811e65cca8e3a0..f438cb20e1b5b4edfbc2eb844693e92df9ff6a35 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 40e11b321916bc5a0decb5468b729d8bae64ba04..c31fb75f0bf1827935bc26f5d1d79bcb68adc464 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 3a62bb54191b9970cabf2529919729a9a8bf4e9c..17815d6c00e8d4baea9115eee409cf156b9d6438 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 53c94f9dde62a3f82d65d68b2ab26e9d6715894e..f80cdabd2ddd8ac045b9a3449bf69d4fd3ab73b0 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 9d1714339252fa10ebebf2989766bf2b20939f88..a718de3dcc83546b51f6711b1462a130aa66d229 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 33ba4e907e0afbe289ea1e48f267844ebb5b6e12..bc4209ca79be14508d2c322c76c494c428d8f19b 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 69bd80b844b94bd86c2aa89c46804fd885d377ec..09fd0bfc867963f401b59ae0201b564b7489d84b 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 cb52b4182af431f92b28432c32e3bb9b668a0621..71a3f9e07ad66eb2e36ddcbbb3dae2ed87b81b7a 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 32dadc7706960a5663189a7874ad436936100167..9e40c5a1075c90500ca2c5d10d8fefb21e784b50 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 2cef23328d27c9c45067ac9d2beccd6f447716f1..46bfb5c6e0e5a1b4b23ecba423785b9dd0eec64b 100644 (file)
@@ -15,7 +15,7 @@
  */
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "auth_cfg_wrapper.h"
 
index 02fb8d50ac08666c00e59c1303774fd1abe7f610..32a0e6759a8c4b29ec95e9ade731db16af73641e 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 48300b0897ea30ecaed68987afd9ea9170695b29..5a363e9f07d539dfb582843302ce0b6db64469cc 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 56f0deddab032d02fdeccd08dcba78768fb94d7a..08b2264682a932501e45ace444e3de5f0ce2a058 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 674fe04ed69a7b5939f08614031b51f902ec82a2..687603589633988f71edb0b776ee3583f4a3deb0 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 f3cc5d2f74a16b06b2e240d57f8879486773168b..73dfdc447ae00e65184b96ac00a47372f15890d1 100644 (file)
@@ -15,7 +15,7 @@
  */
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include <asn1/oid.h>
 #include <asn1/asn1.h>
index 1e4cf11bff44696342a9d360a197469db63d1308..c181c5de7df3198d8a17ededc3c165f3007c78b1 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 ec1b5af5978a1107d5d2086dcb14742406168d4f..a638eef2f32e476ff5ca95d531b24a09753b5e37 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 db0c84545c0ffccf5dc754c886c4c30d1dbd4f87..2a8dda7e1b0ce91f0770154060bc8a060d48c402 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 1d0614001a9a83b137ecc20a3aec928137e611dc..66a8ff1f5c292fbaeebfcf1ac692f0ca5f0bfce9 100644 (file)
@@ -18,7 +18,7 @@
 
 #include "host.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <library.h>
 
 #define IPV4_LEN        4
index c12beccbac10f06b5084ca19557e61203d4a1484..73ca3326ba5292d20608dd73bb3f6b6efd5cc497 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 36f3359c0fddf1423ced66db2fdff068173067ef..d07327e5c25b402ae6df1ca306de37215d37969c 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 7fe47c578d8a3351d9196a9561dbcb7cb46f9347..331d1e8010aaf21f925538e48125c61a4512922b 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 8d49431b390de3f2194c01db49dd155974b073c6..42c78c1721a6cc4bca625a8d302104e8f711c9a1 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 725d02d7679013d497be3493ce39f56385ee85d3..c8cb7fbf275f195ed38a2ea0786f5acb1a644023 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 5d697fdd059c380039029592bfad14659574a8a2..83a74299a56962403e0d070b052d0240ea778123 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 7f8c0aec2cc6e41eafc87a2e45af658b7cfccc91..c68b74f9613a631f737e481f39ab25c4da912e22 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 8628c4bb5fbdae9525fb375f020b52a3681d0a71..062fe129f798936ecddbabf04172a9cb13d629ab 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 ea4eb6cda12958ac0338824ce3488dc26d98ac8a..b8a4515003f92310b5fce3a1b98940b89719f394 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "dnskey_builder.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <credentials/keys/private_key.h>
 
 
index 3fe204d35a2b00cb9571847fa32f8e081dea8238..23825078e6f2a161b5386239ff4837cc7e23b2ca 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 0b5dc036547be01782c061605669ecb090722c0c..a737cb13dcc1b62482866679f6c0082875a929ec 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 0efd3ba16d3b741bf7f516b5de021bbcc715880c..f418b941db866e4c91b44a2f545aaf5aa82297ab 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 3155a4aa007c0f5a9596a31014ed6685808698bd..af7993101b428e548b82262f7b4315f163cdc09c 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "gcrypt_hasher.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 #include <gcrypt.h>
 
index 5ebdcebce28748ed719d39535938a722e4e41cae..78d75a238ecab24380a0fc5eada12ad4494b4ad9 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 9fdb2d45b99b3ed388a2a0879272eee3f4d0ac29..938a464903f5787bb6100da6971d0c44b96f0548 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 c54f2c0cf3e1d3fd745146281b6fe2690414f9b4..291287a8f0e8a3e028d1e7ec16f8c509d21fc186 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 7d232e4f1c7340a1b113885b17da48bd6f32360c..b74d35169f44795feef092fe12191fd5845a567f 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 590ab6cb4bc5be05f9a53848b9229e86e9fe0d9c..6ecf4ec5273e70b24c49396de39267cc1b9c2bcc 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 2d84f0025f14aec67d66536862af13476a5a489c..494b0164a8233c7847b37c5afad51b1157c55c92 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 75f9648532e23bdb5b710488860d99237e37e761..40b6d1f6357f6a2ec1cc11821efd3a41c30451f5 100644 (file)
@@ -22,7 +22,7 @@
 #include <errno.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "ldap_fetcher.h"
 
index d31e1eb33c09587c899179ffbe9228e972e64a01..7e1da683e648a6c4d0b359531af2f474f5633701 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 dd8b32761030102243839cafd723d135a3184adf..23d7097392155df19c084ef8e0ee9abd1e2ba235 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 0402e3574a4e6ee9d48e77c5d7b57707d89b55a2..64ed2e08d6fdc56b931063c9d74f99f46d95486b 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 1956bf6255d59626910225a85bb68609f0837c16..d4f36f58b5eb8c7a6633a4ae13ec2229d5c48b24 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 b27aa339135befb3f2c3083dcaf83d8668c0518a..4dc5663f170809b3396a8c1ebb02dda39c5724a2 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 9e406758935280ae4e70043be8c27610df88f10c..d846278c821a5eaf33e4bb1979387be8a48b74ee 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 950504573550fa6bcb03c7760e5e5037c991d503..d350d050b0520902b618adb6acb643cacc951426 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 9cb68a3ab2896962ac7389e78320b3f1131608aa..3f5125b31e3be0d4c6124985871b1acafb0fdcb4 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 b69de981ed158d315462082558b3d67c76242986..1f7497a70fe2d1ecbf522a952de380fafafe182c 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 c83244f60e7ba2a8ffbd18ad565aa3dc9e296ef7..d3d64f5e8163c7a55e50454c4bc5de7cd66c0977 100644 (file)
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <openssl/rand.h>
 #include <openssl/err.h>
 
index 98cd700bfa9054d814e6207c3dee77be1ff26600..926e5928c1d0f6e5fdcfe4ae9204a037ec263e57 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 5872a81596123ac404f7bc1cb285ad717723c296..0da5d251466d9000f46abbe67c5a85721c3fcb5e 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 1eb1c67232017ce8b605f9abee21255f15d7fbce..bc10dd28c764bb472c4c82da39c332501ae97b31 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 a7c99a1efb8f7721ffe53562aec3e3c5cc89c9e2..b847c0a636c64f396e8008adcce0eeabfb120416 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 9d4afd8e877115632f4e16da7735afdd463423f4..b887c2c847e4a667d11921a3b05c8a54b551e295 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 eefb2eb485d2d17be898616ae69b677d07378bb0..08e81b3c5811664b668e972e2c94e526926be588 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 f358dc764a7828314be32b475875ec9254cee35b..3ff357202c123dd85c7677350c7865b6585580d1 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 a99bed2f617ac93aec566484bee6763c9629c0a1..89d7094ade1e70c5bd4e374673eb207e1a2af472 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 d16d1d71bc611c393b49e0c3a030fffb03327575..100f3ef33747265f6ba47547a5e2a77b89233922 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "pgp_encoder.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 /**
  * Build a PGPv3 fingerprint
index 7fd905ce4ea07c8e6175a9b2b5cd1a6c8fc73d5b..bb15627fd3bcbd0b7f05d0c26d9c77b03d68de53 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 6d022f36274ad6bf11a96299d0ca9218bc2f4ec8..c6661fcdab9dd7a34a394e83232e03e5c0d161b3 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 9122e8d8e9c921945cc29fdfc964c3f4f7daaa6f..60f0ca75736cb771f6f43afa501b61022286ed4f 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 ef936d4a1d6e4472a80cd3385e132b4d94de19fb..e65f3a06b0e88518bd212ea5a83771d9421f8662 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 c870370c84553f4481e97473e3a111a9e0eee4f0..2e5af95fff0d18e4ab82e08bbb2ef9d721ac6363 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 53a2bfca7123056d5813b474c7a37695eed35c4c..80079b9a9df285ae3011d6392a9cd449e9acdb2e 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 b7b2ada7d08bdfb40a19c4813796d09ab8da4798..7661473b14ac11cc3b916833a2ff3cbdae450e67 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 52e46d322b4a71f3084066a9b2fcd61f2ee3c494..8bda5b66fafab43b3ab81919926d072784d617a4 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 7760f35928341ee4cbbe50e966c7f43dff4be408..9afaf123af4ba1e2e022ef4a210434faae96388c 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 aa6e6e28b2718a974669a9adc1709b3da658a154..bb9cc7a21f6555f38f205e3b8a3f5f2c3a8ab3ba 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 a8bfb56e040c78549cdbd72376f74f639731918b..0302c0edd3fbf77bb89b191b7b034fa43c38d92a 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 20e4b6f766f4d7fb8b380727cfdc0f44698f2c8f..d18028b459e651bfe8222e823316d51ea60abb78 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "pkcs11_rng.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "pkcs11_manager.h"
 
index a501423b17b02e413786dd392b1260e41fa3316d..26a3620d71efeccb4c8318cec73aa3bfc8c282f2 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 6e043878c03c078c877ef22524d8319160f7af6d..d39fa6eee3db0ea85751bd68fe02c5b6e2061301 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 10336950c77c95b2f5dd99b7a2b6f127c580a0a0..cea219e923329aa8b825e4c44298c727631b32a3 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 0304ccb36626905eab1cbb8822e6d46a1af4c3e0..95f53f919909f5b1d05e5a4419463d1f22ebc4c3 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 cef20047a5f60ab17ef22be907fa474bece91aa9..24c711a69bfe2b8f4be31a8d26c4921907187a4a 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 52cfc080e6d3cf73a92b468f30927da68f1bd3e6..568844899d63529798fa2921bac971196ec362fe 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"
index dc8e454e7a843f278c15a4e446d4ac0d2c674e31..44c23455979ae5b60f80e6fce0f12265240b89f0 100644 (file)
@@ -17,7 +17,7 @@
 
 #include "revocation_validator.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <credentials/certificates/x509.h>
 #include <credentials/certificates/crl.h>
 #include <credentials/certificates/ocsp_request.h>
index 3e5786b1216c5afdf6ab61139d12d4f19f9c8132..681a3c357165cc5397a9eef1e08e982884432dce 100644 (file)
@@ -18,7 +18,7 @@
 #include <libsoup/soup.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #define DEFAULT_TIMEOUT 10
 
index 0fb3c7fff9e5614c0ab08edd3d8a7364d26e8826..e2352b2857a4729eb6e4ebb948191468e45d38e4 100644 (file)
@@ -18,7 +18,7 @@
 #include <sqlite3.h>
 #include <unistd.h>
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/mutex.h>
 
 typedef struct private_sqlite_database_t private_sqlite_database_t;
index 18e0c9278a66eacf3bd676cbc540e90e8ce15fcb..3316c364dbdbe8c57bcd666012a5c3bf1f9f42fb 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <crypto/crypto_tester.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 /**
  * Monobit test
index ddfb952c7edb6e9a299effd16dfa977c622aaafb..7d83e48eacf3bc4b28a5087f9f944ab40bc17654 100644 (file)
@@ -22,7 +22,7 @@
 #include <time.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <asn1/oid.h>
 #include <asn1/asn1.h>
 #include <asn1/asn1_parser.h>
index 09480df7c58e7f95f25f25000e8cadbfeb19b465..c93b83befc7b4d68b40605ec26045c140e5d7daa 100644 (file)
@@ -29,7 +29,7 @@
 #include <stdio.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <asn1/oid.h>
 #include <asn1/asn1.h>
 #include <asn1/asn1_parser.h>
index a3bc4efb048cda7e9b55bd3d2898ea3b724b5966..5350d4a511a1d0386e067737881adb55e09e8a40 100644 (file)
@@ -20,7 +20,7 @@ typedef struct revoked_t revoked_t;
 
 #include <time.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <library.h>
 #include <asn1/oid.h>
 #include <asn1/asn1.h>
index 5f82118c87862ef55c7cd753abea1cfa6f4bbbfe..09c5a85399056f78aedc16ddeda402a4c994187f 100644 (file)
@@ -22,7 +22,7 @@
 #include <asn1/asn1.h>
 #include <utils/identification.h>
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <credentials/certificates/x509.h>
 #include <credentials/keys/private_key.h>
 
index 42994a2917033ee3476424165dfeae0ba16b0f7e..1f89299588c9df54deb4a737ba7e2b35617ea6bb 100644 (file)
@@ -24,7 +24,7 @@
 #include <asn1/asn1_parser.h>
 #include <utils/identification.h>
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include <library.h>
 #include <credentials/certificates/x509.h>
index 2fa8d413df4a243c794dc21a3143be5ae833f876..024b4dba591290067b21b9cab733d7f6a71a4b5f 100644 (file)
@@ -18,7 +18,7 @@
 #include "x509_pkcs10.h"
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <asn1/oid.h>
 #include <asn1/asn1.h>
 #include <asn1/asn1_parser.h>
index 1bb7e640a589bfe4b1cbeda53a86963d0c872e3b..802c8a39fd4b03402c1b1091eb022e11de2b15b8 100644 (file)
@@ -18,7 +18,7 @@
 
 #include "xcbc.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 abeac76e38361762c9c9e1c3664e2751f4b3b489..934636fc01ba92981debc760ea58622425f9b27d 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "processor.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/thread.h>
 #include <threading/condvar.h>
 #include <threading/mutex.h>
index c97dbc4be57375677a3273a3ad3c1e7147c6f68c..3f1598fc48a93d8a26bf2f4f915f3003406b162b 100644 (file)
@@ -19,7 +19,7 @@
 
 #include "scheduler.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <processing/processor.h>
 #include <processing/jobs/callback_job.h>
 #include <threading/thread.h>
index f0caad13982ce40712ff05a7829dae8540216e4a..87e57095c3d23dd646baac631d160fa6ca77d952 100644 (file)
@@ -24,7 +24,7 @@
 
 #include <collections/linked_list.h>
 #include <utils/identification.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #define NON_SUBNET_ADDRESS_RANGE       255
 
index 9bdb7443459adb3a5e7e214f765f60f63e014221..712ea6ee2fc9ed62df2fb61d1584ac4c8c3dac91 100644 (file)
@@ -31,9 +31,9 @@
 
 #include "settings.h"
 
-#include "debug.h"
 #include "collections/linked_list.h"
 #include "threading/rwlock.h"
+#include "utils/debug.h"
 
 #define MAX_INCLUSION_LEVEL            10
 
index df0cd27bfc921ee43cd4fe2cf911265835771cf4..f86e781c5c1c3fbda57dec67b68463b26b914f10 100644 (file)
@@ -21,7 +21,7 @@
 #include <errno.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "condvar.h"
 #include "mutex.h"
index 9ce9c6a719df6a1dedf0bc76b77da0045e6e1dbf..17644570588f2635e90922feebc293d66e4365c5 100644 (file)
@@ -18,7 +18,7 @@
 #include <pthread.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "rwlock.h"
 #include "rwlock_condvar.h"
index 812cf696bd21d149540eab8c6f947aec66f9156d..f0602f0b09fdaddde395a137684026b747ff90d6 100644 (file)
@@ -17,7 +17,7 @@
 #include <pthread.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "spinlock.h"
 #include "mutex.h"
index 33b09304b52d64b01e94b3786d181e0a75f2c361..e524409c70affc0f989cb15f3b4d308adb09dc21 100644 (file)
@@ -32,7 +32,7 @@ static inline pid_t gettid()
 #endif
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include <threading/thread_value.h>
 #include <threading/mutex.h>
index 4e13a4c517aa69664bd34b85c2b95869e29935e0..bf0224c5fbaccc3156c345b5dc62f1b60bf68783 100644 (file)
@@ -27,8 +27,8 @@
 #include <time.h>
 #include <pthread.h>
 
-#include "debug.h"
 #include "collections/enumerator.h"
+#include "utils/debug.h"
 
 ENUM(status_names, SUCCESS, NEED_MORE,
        "SUCCESS",
index 34128d0106f3e754d4ebdde9558acdd8948d15ea..c36a76efe34e8733008fd3629f48a3009c43f727 100644 (file)
@@ -27,7 +27,7 @@
 # include <sys/prctl.h>
 #endif /* HAVE_PRCTL */
 
-#include <debug.h>
+#include <utils/debug.h>
 
 #if !defined(HAVE_GETPWNAM_R) || !defined(HAVE_GETGRNAM_R)
 # include <threading/mutex.h>
similarity index 99%
rename from src/libstrongswan/debug.h
rename to src/libstrongswan/utils/debug.h
index 337dfd92f68ed1df0d696c58a365f8d97e3ce28c..c46d3fe55608f3e361b48ecda79a138bee83a5fd 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup debug debug
- * @{ @ingroup libstrongswan
+ * @{ @ingroup utils
  */
 
 #ifndef DEBUG_H_
index 723f33098bd4dc7ae22f2a8c622e467d5549de78..2b0be166125249793df07ded4408c2ac471eb21c 100644 (file)
@@ -32,7 +32,7 @@
 #include "leak_detective.h"
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <utils/backtrace.h>
 #include <collections/hashtable.h>
 
index 5fd4cfd4d185c8e4d6a2e5bbf9896f50e0e0f45b..a550c1aa3ca40db30cbb3a3674d14f33fa1cd7a7 100644 (file)
@@ -17,7 +17,7 @@
 #include <errno.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <utils/lexparser.h>
 
 #include "optionsfrom.h"
index 2bcaffbc859c10d4cd86f6c3e555b327a6d528cb..dea08e3ebf905b9e20517608a2d5aa5f3b306e91 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "tls.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "tls_protection.h"
 #include "tls_compression.h"
index 6647129ba50c61dced896d0f10d913fc55f6b0c7..7dd219db8da51d0998ecec6376c150b39242b46f 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "tls_alert.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 
 ENUM_BEGIN(tls_alert_desc_names, TLS_CLOSE_NOTIFY, TLS_CLOSE_NOTIFY,
index 1bcc966d5944ec8a2d7d92ef1a1b4f782c9ef25c..c13b1e8512fabdb79bfb2f9659435df5dd2e05bd 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "tls_cache.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 #include <collections/hashtable.h>
 #include <threading/rwlock.h>
index f749848792718f45fd228e834ec031bc83fdd0dd..20a7da0234833bc213b03804d98e1bd7d7825417 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "tls_crypto.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 ENUM_BEGIN(tls_cipher_suite_names, TLS_NULL_WITH_NULL_NULL,
                                                                   TLS_DH_anon_WITH_3DES_EDE_CBC_SHA,
index 928aadcb33ee81f43b83b774e908f404ded7d6c2..68cebb9941672bebeae2f0deb0614a6fef717dfa 100644 (file)
@@ -18,7 +18,7 @@
 
 #include "tls.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <library.h>
 
 /**
index f2fa77cfd50426ed9348b4cbb3a4a4be0a10d27d..c76376b432bb2c45dff9fc683359e3923a7dbdf7 100644 (file)
@@ -16,7 +16,7 @@
 #include "tls_fragmentation.h"
 
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 /**
  * Maximum size of a TLS handshake message we accept
index 65072d087f18d5690298eaa647a771276bc618d1..e9f967e842ca2bb9f150b2fba08a03e2364d889a 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "tls_peer.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <credentials/certificates/x509.h>
 
 #include <time.h>
index 8263728bbe359b79f261789367590df310d3d6f6..0d5df18f7fbbc88ea73d19ecf34433753d4ed40d 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "tls_protection.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tls_protection_t private_tls_protection_t;
 
index a66448d24e549871fc3db4596dbaf50e0edf9a4d..ec42b67fc9016de606978bbc2f44b8db7a9299b1 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <time.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <credentials/certificates/x509.h>
 
 typedef struct private_tls_server_t private_tls_server_t;
index 3abff596daf9f83cb6f208d40f56d1d7ac1a9952..75b714e308469f3b9d3032b0a01a2428761bbaee 100644 (file)
@@ -18,7 +18,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/thread.h>
 
 /**
index 7c0ee413227e197586ab6df0eeb8cb4603a2f928..feded3b2c6b674ac3b8a5278be082bb25459e4a5 100644 (file)
@@ -23,7 +23,7 @@
 #include <fcntl.h>
 
 #include <utils/lexparser.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tnc_t private_tnc_t;
 
index fa91bfb217c0a341f672d58081d08378636b3408..fca4b25842e1fb08d260660237673cede00fb320 100644 (file)
@@ -17,7 +17,7 @@
 
 #include "tnc/tnc.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 /**
  * See header
index 5c297cf0c17a9f006bcceeac33b2faa88b1ee290..15ed38154a170cec0a68d596562c018d4634ff9d 100644 (file)
@@ -14,7 +14,7 @@
  */
 
 #include <dispatcher.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <stdio.h>
 
 #include "manager.h"
index edcf653b2310f25fe6e4a5926cd2ccb2c572aa1c..7b0b9e6ac9a68b0717b7910cbe2bc1ccf86007cc 100644 (file)
@@ -20,7 +20,7 @@
 #include "peer_controller.h"
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <asn1/asn1.h>
 #include <asn1/oid.h>
 #include <utils/identification.h>
index d21abdc46647927cf4859ca6833d8aaf3da1bd80..436a72f2b99f95c4a7abc414b5d69319e443f2a3 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "auth_filter.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_auth_filter_t private_auth_filter_t;
 
index 1f43a7e1745aec139dd4beca642321da9a09c16c..03b1352890da75d2144b3abdd0b55510600ee851 100644 (file)
@@ -17,7 +17,7 @@
 #include <stdio.h>
 
 #include <dispatcher.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <database/database.h>
 
 #include "filter/auth_filter.h"
index 745988750e2372b56e22e866741ee1efce06746c..7b81d6ceadf2baf55bed59c2362c840ce6cbb077 100644 (file)
@@ -31,7 +31,7 @@
 #include <time.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <asn1/asn1.h>
 #include <credentials/certificates/x509.h>
 #include <credentials/certificates/ac.h>
index 43328575c17d399c1a70e50e27e0d56ae4a4f0aa..a5e5b852844055e9e48bd70c637cbf2bf21d6518 100644 (file)
@@ -23,7 +23,7 @@
 #include <stdio.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <utils/optionsfrom.h>
 
 /**
index 34df6c2c7d010474c9f0f575428bbe7b8e6624ed..5f098ba419761d076d6a337dc83b5f209b4f9d2e 100644 (file)
@@ -17,7 +17,7 @@
 
 #include "pki.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <asn1/asn1.h>
 #include <collections/linked_list.h>
 #include <credentials/certificates/certificate.h>
index dc53022f29123c15c9a25ec08924d37108f35922..f9746cca709c32574454f14cef3c0065e5b72dad 100644 (file)
@@ -17,7 +17,7 @@
 
 #include "pki.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 #include <credentials/certificates/certificate.h>
 #include <credentials/certificates/x509.h>
index e28bf15955ac44c405af585c0c92f6d0b709df7d..3f77c5e8d62389c4e7e3f0231ae46be5c16bbc2d 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <unistd.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <credentials/sets/callback_cred.h>
 
 /**
index 8b2fd179a2a827d56cde062db77d1fd862619fe8..855af39656c7128bb1413100ef009159e33c6c13 100644 (file)
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <asn1/asn1.h>
 #include <asn1/asn1_parser.h>
 #include <asn1/oid.h>
index 2638ec84d2e2ad8af1eb7186ef575a5523781e03..f57afca28f7ebf0aed5029184c201d4cbada172d 100644 (file)
@@ -26,7 +26,7 @@
 #include <syslog.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <asn1/asn1.h>
 #include <asn1/oid.h>
 #include <utils/optionsfrom.h>
index 2416960bd2b3e583742440d768139ca73f249718..1c16e0b9c8e0bad557904c60f746d5bf58e9df52 100644 (file)
@@ -18,7 +18,7 @@
 #include <string.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "keywords.h"
 #include "confread.h"
index 6544b1ccdc114903de8837fc9eb886e2e4779486..6e3ac17d901de2d16ab5fd1d971a6e53e9cdbf75 100644 (file)
@@ -22,7 +22,7 @@
 #include <netdb.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "keywords.h"
 #include "confread.h"
index 102d1589e0d6006985133fb1ea24f72f12860897..1c93381f7e20a570d188e82c8aeb5c9d542d5756 100644 (file)
@@ -24,7 +24,7 @@
 #include <errno.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "confread.h"
 #include "invokecharon.h"
index 484b7e281e03830242dbc18e47fc2ce97fed240f..22165465fc186964dff92f5c5de73498a3f67339 100644 (file)
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "files.h"
 
index 25f68e5051061b86cee925a2972a47fbe2dab19b..921a220db074b4d8af70def6ed6b36c09a9584d3 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <library.h>
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "files.h"
 
index 424e3a9fd48153dd1af66d29faf3b4a5b92f86aa..2cf0501f478b9cc0291f11d62a1e5b753f688c9f 100644 (file)
@@ -18,7 +18,7 @@
 #include <string.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "ipsec-parser.h"
 
index 85197cd8b2aa90743e72316e15861015762cbecc..727a0d60c49266b00911c487d157a10c97a421b4 100644 (file)
@@ -34,7 +34,7 @@
 #include <hydra.h>
 #include <utils/backtrace.h>
 #include <threading/thread.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "confread.h"
 #include "files.h"
index 9cff78c7d80e2367f81137c84e31078108f0cba2..68e6fd5eabbc4f7ac30adf7c82ef18df8b93197c 100644 (file)
@@ -27,7 +27,7 @@
 #include <credentials/auth_cfg.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include <stroke_msg.h>