diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-10-16 16:03:21 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-10-24 16:00:51 +0200 |
| commit | f05b427265e20ccb43889094e4c58c1a5bf3e290 (patch) | |
| tree | 288cb6436f7af1a50a592e377327dc678bbe29f7 | |
| parent | d5c143e5be0fb4beefe6a2da1f0f181bf4468883 (diff) | |
| download | strongswan-f05b427265e20ccb43889094e4c58c1a5bf3e290.tar.bz2 strongswan-f05b427265e20ccb43889094e4c58c1a5bf3e290.tar.xz | |
Moved debug.[ch] to utils folder
306 files changed, 445 insertions, 443 deletions
diff --git a/scripts/dh_speed.c b/scripts/dh_speed.c index 629a8eabb..588807597 100644 --- a/scripts/dh_speed.c +++ b/scripts/dh_speed.c @@ -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() diff --git a/scripts/fetch.c b/scripts/fetch.c index ad50d0cd6..23f857246 100644 --- a/scripts/fetch.c +++ b/scripts/fetch.c @@ -17,7 +17,7 @@ #include <unistd.h> #include <library.h> -#include <debug.h> +#include <utils/debug.h> static int count = 0; diff --git a/scripts/key2keyid.c b/scripts/key2keyid.c index 5b63381b8..aba96a8c1 100644 --- a/scripts/key2keyid.c +++ b/scripts/key2keyid.c @@ -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> diff --git a/scripts/keyid2sql.c b/scripts/keyid2sql.c index 7cad4c45e..26427ab3d 100644 --- a/scripts/keyid2sql.c +++ b/scripts/keyid2sql.c @@ -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> diff --git a/scripts/pubkey_speed.c b/scripts/pubkey_speed.c index 6402e606d..32c6e8f49 100644 --- a/scripts/pubkey_speed.c +++ b/scripts/pubkey_speed.c @@ -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) diff --git a/scripts/tls_test.c b/scripts/tls_test.c index 3bdb34529..d0d259e60 100644 --- a/scripts/tls_test.c +++ b/scripts/tls_test.c @@ -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> diff --git a/src/dumm/bridge.c b/src/dumm/bridge.c index 3f4fdce9f..d00e49b3e 100644 --- a/src/dumm/bridge.c +++ b/src/dumm/bridge.c @@ -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" diff --git a/src/dumm/cowfs.c b/src/dumm/cowfs.c index a6152bf25..28c62c217 100644 --- a/src/dumm/cowfs.c +++ b/src/dumm/cowfs.c @@ -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> diff --git a/src/dumm/dumm.c b/src/dumm/dumm.c index 4d0ca9bc2..cc4f5a16b 100644 --- a/src/dumm/dumm.c +++ b/src/dumm/dumm.c @@ -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" diff --git a/src/dumm/ext/dumm.c b/src/dumm/ext/dumm.c index 4c6a1484d..7c7d65acd 100644 --- a/src/dumm/ext/dumm.c +++ b/src/dumm/ext/dumm.c @@ -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 diff --git a/src/dumm/guest.c b/src/dumm/guest.c index 752d3075f..8e74ca629 100644 --- a/src/dumm/guest.c +++ b/src/dumm/guest.c @@ -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" diff --git a/src/dumm/iface.c b/src/dumm/iface.c index 7ac3b7160..3e7b010b3 100644 --- a/src/dumm/iface.c +++ b/src/dumm/iface.c @@ -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" diff --git a/src/dumm/mconsole.c b/src/dumm/mconsole.c index 40045cc3a..54c4fe395 100644 --- a/src/dumm/mconsole.c +++ b/src/dumm/mconsole.c @@ -25,7 +25,7 @@ #include <errno.h> #include <sys/un.h> -#include <debug.h> +#include <utils/debug.h> #include "mconsole.h" diff --git a/src/frontends/android/jni/libandroidbridge/backend/android_attr.c b/src/frontends/android/jni/libandroidbridge/backend/android_attr.c index f9e96a76c..bf6073fef 100644 --- a/src/frontends/android/jni/libandroidbridge/backend/android_attr.c +++ b/src/frontends/android/jni/libandroidbridge/backend/android_attr.c @@ -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; diff --git a/src/frontends/android/jni/libandroidbridge/backend/android_private_key.c b/src/frontends/android/jni/libandroidbridge/backend/android_private_key.c index 3ed3d75a9..38bbb4755 100644 --- a/src/frontends/android/jni/libandroidbridge/backend/android_private_key.c +++ b/src/frontends/android/jni/libandroidbridge/backend/android_private_key.c @@ -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; diff --git a/src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c b/src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c index 85fe5d4c1..dc272e6ff 100644 --- a/src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c +++ b/src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c @@ -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> diff --git a/src/frontends/android/jni/libandroidbridge/kernel/android_net.c b/src/frontends/android/jni/libandroidbridge/kernel/android_net.c index 430c95bc8..032fe2086 100644 --- a/src/frontends/android/jni/libandroidbridge/kernel/android_net.c +++ b/src/frontends/android/jni/libandroidbridge/kernel/android_net.c @@ -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> diff --git a/src/frontends/android/jni/libandroidbridge/kernel/network_manager.c b/src/frontends/android/jni/libandroidbridge/kernel/network_manager.c index 9c97fbb14..17bde6a84 100644 --- a/src/frontends/android/jni/libandroidbridge/kernel/network_manager.c +++ b/src/frontends/android/jni/libandroidbridge/kernel/network_manager.c @@ -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; diff --git a/src/frontends/android/jni/libandroidbridge/vpnservice_builder.c b/src/frontends/android/jni/libandroidbridge/vpnservice_builder.c index 6ff732520..c95b335dc 100644 --- a/src/frontends/android/jni/libandroidbridge/vpnservice_builder.c +++ b/src/frontends/android/jni/libandroidbridge/vpnservice_builder.c @@ -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; diff --git a/src/libcharon/bus/bus.h b/src/libcharon/bus/bus.h index 485b1dc6a..8a6382f88 100644 --- a/src/libcharon/bus/bus.h +++ b/src/libcharon/bus/bus.h @@ -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> diff --git a/src/libcharon/plugins/addrblock/addrblock_validator.c b/src/libcharon/plugins/addrblock/addrblock_validator.c index 1b07378f7..65f4ed08c 100644 --- a/src/libcharon/plugins/addrblock/addrblock_validator.c +++ b/src/libcharon/plugins/addrblock/addrblock_validator.c @@ -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> diff --git a/src/libcharon/plugins/certexpire/certexpire_cron.c b/src/libcharon/plugins/certexpire/certexpire_cron.c index e8cd4bfd8..5f2fd7ca4 100644 --- a/src/libcharon/plugins/certexpire/certexpire_cron.c +++ b/src/libcharon/plugins/certexpire/certexpire_cron.c @@ -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; diff --git a/src/libcharon/plugins/certexpire/certexpire_export.c b/src/libcharon/plugins/certexpire/certexpire_export.c index 1b912171a..e339b8004 100644 --- a/src/libcharon/plugins/certexpire/certexpire_export.c +++ b/src/libcharon/plugins/certexpire/certexpire_export.c @@ -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> diff --git a/src/libcharon/plugins/eap_peap/eap_peap_avp.c b/src/libcharon/plugins/eap_peap/eap_peap_avp.c index 10f6ec11c..f7f634a53 100644 --- a/src/libcharon/plugins/eap_peap/eap_peap_avp.c +++ b/src/libcharon/plugins/eap_peap/eap_peap_avp.c @@ -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); diff --git a/src/libcharon/plugins/eap_peap/eap_peap_peer.c b/src/libcharon/plugins/eap_peap/eap_peap_peer.c index 79fd667cb..f482c5b54 100644 --- a/src/libcharon/plugins/eap_peap/eap_peap_peer.c +++ b/src/libcharon/plugins/eap_peap/eap_peap_peer.c @@ -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; diff --git a/src/libcharon/plugins/eap_peap/eap_peap_server.c b/src/libcharon/plugins/eap_peap/eap_peap_server.c index 0e8046501..5237cb62c 100644 --- a/src/libcharon/plugins/eap_peap/eap_peap_server.c +++ b/src/libcharon/plugins/eap_peap/eap_peap_server.c @@ -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; diff --git a/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_provider.c b/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_provider.c index 32225d2e0..3c63e82a9 100644 --- a/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_provider.c +++ b/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_provider.c @@ -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; diff --git a/src/libcharon/plugins/eap_tnc/eap_tnc.c b/src/libcharon/plugins/eap_tnc/eap_tnc.c index 7efc0fec5..ffa1bae39 100644 --- a/src/libcharon/plugins/eap_tnc/eap_tnc.c +++ b/src/libcharon/plugins/eap_tnc/eap_tnc.c @@ -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> /** diff --git a/src/libcharon/plugins/eap_ttls/eap_ttls_avp.c b/src/libcharon/plugins/eap_ttls/eap_ttls_avp.c index 0d531c437..47e0f8afb 100644 --- a/src/libcharon/plugins/eap_ttls/eap_ttls_avp.c +++ b/src/libcharon/plugins/eap_ttls/eap_ttls_avp.c @@ -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 diff --git a/src/libcharon/plugins/eap_ttls/eap_ttls_peer.c b/src/libcharon/plugins/eap_ttls/eap_ttls_peer.c index 00a4da3f8..66c9deed8 100644 --- a/src/libcharon/plugins/eap_ttls/eap_ttls_peer.c +++ b/src/libcharon/plugins/eap_ttls/eap_ttls_peer.c @@ -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> diff --git a/src/libcharon/plugins/eap_ttls/eap_ttls_server.c b/src/libcharon/plugins/eap_ttls/eap_ttls_server.c index 1418d6a4d..464de17ba 100644 --- a/src/libcharon/plugins/eap_ttls/eap_ttls_server.c +++ b/src/libcharon/plugins/eap_ttls/eap_ttls_server.c @@ -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> diff --git a/src/libcharon/plugins/tnc_ifmap/tnc_ifmap_listener.c b/src/libcharon/plugins/tnc_ifmap/tnc_ifmap_listener.c index eac285ca3..9cd1ec381 100644 --- a/src/libcharon/plugins/tnc_ifmap/tnc_ifmap_listener.c +++ b/src/libcharon/plugins/tnc_ifmap/tnc_ifmap_listener.c @@ -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; diff --git a/src/libcharon/plugins/tnc_ifmap/tnc_ifmap_soap.c b/src/libcharon/plugins/tnc_ifmap/tnc_ifmap_soap.c index 6465f5096..33480bb85 100644 --- a/src/libcharon/plugins/tnc_ifmap/tnc_ifmap_soap.c +++ b/src/libcharon/plugins/tnc_ifmap/tnc_ifmap_soap.c @@ -15,7 +15,7 @@ #include "tnc_ifmap_soap.h" -#include <debug.h> +#include <utils/debug.h> #include <daemon.h> #include <axis2_util.h> diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc.c b/src/libcharon/plugins/tnc_imc/tnc_imc.c index d8e9d0995..16d822d3b 100644 --- a/src/libcharon/plugins/tnc_imc/tnc_imc.c +++ b/src/libcharon/plugins/tnc_imc/tnc_imc.c @@ -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> diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc_bind_function.c b/src/libcharon/plugins/tnc_imc/tnc_imc_bind_function.c index 90a607ccc..26a5ed2b4 100644 --- a/src/libcharon/plugins/tnc_imc/tnc_imc_bind_function.c +++ b/src/libcharon/plugins/tnc_imc/tnc_imc_bind_function.c @@ -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 diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc_manager.c b/src/libcharon/plugins/tnc_imc/tnc_imc_manager.c index 20ad208b7..fcbeec6eb 100644 --- a/src/libcharon/plugins/tnc_imc/tnc_imc_manager.c +++ b/src/libcharon/plugins/tnc_imc/tnc_imc_manager.c @@ -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; diff --git a/src/libcharon/plugins/tnc_imv/tnc_imv.c b/src/libcharon/plugins/tnc_imv/tnc_imv.c index e82cfc92d..a71ffc0e0 100644 --- a/src/libcharon/plugins/tnc_imv/tnc_imv.c +++ b/src/libcharon/plugins/tnc_imv/tnc_imv.c @@ -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> diff --git a/src/libcharon/plugins/tnc_imv/tnc_imv_bind_function.c b/src/libcharon/plugins/tnc_imv/tnc_imv_bind_function.c index dd11c5009..36cdb7fbb 100644 --- a/src/libcharon/plugins/tnc_imv/tnc_imv_bind_function.c +++ b/src/libcharon/plugins/tnc_imv/tnc_imv_bind_function.c @@ -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 diff --git a/src/libcharon/plugins/tnc_imv/tnc_imv_manager.c b/src/libcharon/plugins/tnc_imv/tnc_imv_manager.c index 0985a47a8..21b7737c3 100644 --- a/src/libcharon/plugins/tnc_imv/tnc_imv_manager.c +++ b/src/libcharon/plugins/tnc_imv/tnc_imv_manager.c @@ -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; diff --git a/src/libcharon/plugins/tnc_imv/tnc_imv_recommendations.c b/src/libcharon/plugins/tnc_imv/tnc_imv_recommendations.c index 11b98d8ca..b39d9cbc9 100644 --- a/src/libcharon/plugins/tnc_imv/tnc_imv_recommendations.c +++ b/src/libcharon/plugins/tnc_imv/tnc_imv_recommendations.c @@ -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; diff --git a/src/libcharon/plugins/tnc_pdp/tnc_pdp.c b/src/libcharon/plugins/tnc_pdp/tnc_pdp.c index 77eaa0e05..39939d34e 100644 --- a/src/libcharon/plugins/tnc_pdp/tnc_pdp.c +++ b/src/libcharon/plugins/tnc_pdp/tnc_pdp.c @@ -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> diff --git a/src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.c b/src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.c index 79aac45ed..0a960635b 100644 --- a/src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.c +++ b/src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.c @@ -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; diff --git a/src/libcharon/plugins/tnc_tnccs/tnc_tnccs_manager.c b/src/libcharon/plugins/tnc_tnccs/tnc_tnccs_manager.c index 2094ec5e8..0b623d6ff 100644 --- a/src/libcharon/plugins/tnc_tnccs/tnc_tnccs_manager.c +++ b/src/libcharon/plugins/tnc_tnccs/tnc_tnccs_manager.c @@ -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> diff --git a/src/libcharon/plugins/tnc_tnccs/tnc_tnccs_plugin.c b/src/libcharon/plugins/tnc_tnccs/tnc_tnccs_plugin.c index a44319ed1..1e4ddc195 100644 --- a/src/libcharon/plugins/tnc_tnccs/tnc_tnccs_plugin.c +++ b/src/libcharon/plugins/tnc_tnccs/tnc_tnccs_plugin.c @@ -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; diff --git a/src/libcharon/plugins/tnccs_11/batch/tnccs_batch.c b/src/libcharon/plugins/tnccs_11/batch/tnccs_batch.c index 1f63de323..b27458fde 100644 --- a/src/libcharon/plugins/tnccs_11/batch/tnccs_batch.c +++ b/src/libcharon/plugins/tnccs_11/batch/tnccs_batch.c @@ -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> diff --git a/src/libcharon/plugins/tnccs_11/messages/imc_imv_msg.c b/src/libcharon/plugins/tnccs_11/messages/imc_imv_msg.c index fa570aae9..cf3e58451 100644 --- a/src/libcharon/plugins/tnccs_11/messages/imc_imv_msg.c +++ b/src/libcharon/plugins/tnccs_11/messages/imc_imv_msg.c @@ -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; diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_error_msg.c b/src/libcharon/plugins/tnccs_11/messages/tnccs_error_msg.c index d0df4e7ca..ba92c26b1 100644 --- a/src/libcharon/plugins/tnccs_11/messages/tnccs_error_msg.c +++ b/src/libcharon/plugins/tnccs_11/messages/tnccs_error_msg.c @@ -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 = { diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_msg.c b/src/libcharon/plugins/tnccs_11/messages/tnccs_msg.c index 5a050393a..79c663905 100644 --- a/src/libcharon/plugins/tnccs_11/messages/tnccs_msg.c +++ b/src/libcharon/plugins/tnccs_11/messages/tnccs_msg.c @@ -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", diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_preferred_language_msg.c b/src/libcharon/plugins/tnccs_11/messages/tnccs_preferred_language_msg.c index fd85350b5..e1c193e18 100644 --- a/src/libcharon/plugins/tnccs_11/messages/tnccs_preferred_language_msg.c +++ b/src/libcharon/plugins/tnccs_11/messages/tnccs_preferred_language_msg.c @@ -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; diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.c b/src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.c index af60a4b3a..cf3c367d8 100644 --- a/src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.c +++ b/src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.c @@ -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; diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_recommendation_msg.c b/src/libcharon/plugins/tnccs_11/messages/tnccs_recommendation_msg.c index 610224242..32e123b2e 100644 --- a/src/libcharon/plugins/tnccs_11/messages/tnccs_recommendation_msg.c +++ b/src/libcharon/plugins/tnccs_11/messages/tnccs_recommendation_msg.c @@ -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; diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_tncs_contact_info_msg.c b/src/libcharon/plugins/tnccs_11/messages/tnccs_tncs_contact_info_msg.c index b8aac30fa..fe288f01d 100644 --- a/src/libcharon/plugins/tnccs_11/messages/tnccs_tncs_contact_info_msg.c +++ b/src/libcharon/plugins/tnccs_11/messages/tnccs_tncs_contact_info_msg.c @@ -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; diff --git a/src/libcharon/plugins/tnccs_11/tnccs_11.c b/src/libcharon/plugins/tnccs_11/tnccs_11.c index 56858a8b4..cfc29d6ab 100644 --- a/src/libcharon/plugins/tnccs_11/tnccs_11.c +++ b/src/libcharon/plugins/tnccs_11/tnccs_11.c @@ -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> diff --git a/src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.c b/src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.c index 3bf048a41..3a2c70f5a 100644 --- a/src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.c +++ b/src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.c @@ -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", diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_msg.c b/src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_msg.c index 974db4d70..cdd0d0d0d 100644 --- a/src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_msg.c +++ b/src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_msg.c @@ -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; } diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_assessment_result_msg.c b/src/libcharon/plugins/tnccs_20/messages/pb_assessment_result_msg.c index ee06575b4..4e50446be 100644 --- a/src/libcharon/plugins/tnccs_20/messages/pb_assessment_result_msg.c +++ b/src/libcharon/plugins/tnccs_20/messages/pb_assessment_result_msg.c @@ -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; } diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_error_msg.c b/src/libcharon/plugins/tnccs_20/messages/pb_error_msg.c index 457d3da21..d048f437c 100644 --- a/src/libcharon/plugins/tnccs_20/messages/pb_error_msg.c +++ b/src/libcharon/plugins/tnccs_20/messages/pb_error_msg.c @@ -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; diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_language_preference_msg.c b/src/libcharon/plugins/tnccs_20/messages/pb_language_preference_msg.c index 46df54486..70a03cdc5 100644 --- a/src/libcharon/plugins/tnccs_20/messages/pb_language_preference_msg.c +++ b/src/libcharon/plugins/tnccs_20/messages/pb_language_preference_msg.c @@ -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; diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_pa_msg.c b/src/libcharon/plugins/tnccs_20/messages/pb_pa_msg.c index bbad9bf55..2d2c1316b 100644 --- a/src/libcharon/plugins/tnccs_20/messages/pb_pa_msg.c +++ b/src/libcharon/plugins/tnccs_20/messages/pb_pa_msg.c @@ -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; diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_reason_string_msg.c b/src/libcharon/plugins/tnccs_20/messages/pb_reason_string_msg.c index 511b45402..935c52d7b 100644 --- a/src/libcharon/plugins/tnccs_20/messages/pb_reason_string_msg.c +++ b/src/libcharon/plugins/tnccs_20/messages/pb_reason_string_msg.c @@ -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; diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_remediation_parameters_msg.c b/src/libcharon/plugins/tnccs_20/messages/pb_remediation_parameters_msg.c index c853f03a3..63d94b94d 100644 --- a/src/libcharon/plugins/tnccs_20/messages/pb_remediation_parameters_msg.c +++ b/src/libcharon/plugins/tnccs_20/messages/pb_remediation_parameters_msg.c @@ -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", diff --git a/src/libcharon/plugins/tnccs_20/state_machine/pb_tnc_state_machine.c b/src/libcharon/plugins/tnccs_20/state_machine/pb_tnc_state_machine.c index 5e95131a8..43f185440 100644 --- a/src/libcharon/plugins/tnccs_20/state_machine/pb_tnc_state_machine.c +++ b/src/libcharon/plugins/tnccs_20/state_machine/pb_tnc_state_machine.c @@ -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", diff --git a/src/libcharon/plugins/tnccs_20/tnccs_20.c b/src/libcharon/plugins/tnccs_20/tnccs_20.c index 4d917ed39..8540f46b9 100644 --- a/src/libcharon/plugins/tnccs_20/tnccs_20.c +++ b/src/libcharon/plugins/tnccs_20/tnccs_20.c @@ -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> diff --git a/src/libcharon/plugins/tnccs_dynamic/tnccs_dynamic.c b/src/libcharon/plugins/tnccs_dynamic/tnccs_dynamic.c index b68d2dd6b..03795a947 100644 --- a/src/libcharon/plugins/tnccs_dynamic/tnccs_dynamic.c +++ b/src/libcharon/plugins/tnccs_dynamic/tnccs_dynamic.c @@ -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); } /** diff --git a/src/libfast/dispatcher.c b/src/libfast/dispatcher.c index 6b89635ae..e5a02c63b 100644 --- a/src/libfast/dispatcher.c +++ b/src/libfast/dispatcher.c @@ -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> diff --git a/src/libfast/request.c b/src/libfast/request.c index 6ca474037..5d03227af 100644 --- a/src/libfast/request.c +++ b/src/libfast/request.c @@ -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> diff --git a/src/libfast/smtp.c b/src/libfast/smtp.c index 1375c2944..a6ca67ddc 100644 --- a/src/libfast/smtp.c +++ b/src/libfast/smtp.c @@ -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; diff --git a/src/libhydra/attributes/attribute_manager.c b/src/libhydra/attributes/attribute_manager.c index dd3963b7f..5fda8b426 100644 --- a/src/libhydra/attributes/attribute_manager.c +++ b/src/libhydra/attributes/attribute_manager.c @@ -15,7 +15,7 @@ #include "attribute_manager.h" -#include <debug.h> +#include <utils/debug.h> #include <collections/linked_list.h> #include <threading/rwlock.h> diff --git a/src/libhydra/attributes/mem_pool.c b/src/libhydra/attributes/mem_pool.c index 1c5ea53de..af53e10de 100644 --- a/src/libhydra/attributes/mem_pool.c +++ b/src/libhydra/attributes/mem_pool.c @@ -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> diff --git a/src/libhydra/hydra.c b/src/libhydra/hydra.c index 7d6256598..16fb3ab94 100644 --- a/src/libhydra/hydra.c +++ b/src/libhydra/hydra.c @@ -15,7 +15,7 @@ #include "hydra.h" -#include <debug.h> +#include <utils/debug.h> typedef struct private_hydra_t private_hydra_t; diff --git a/src/libhydra/kernel/kernel_interface.c b/src/libhydra/kernel/kernel_interface.c index 79a2ab938..542586115 100644 --- a/src/libhydra/kernel/kernel_interface.c +++ b/src/libhydra/kernel/kernel_interface.c @@ -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> diff --git a/src/libhydra/plugins/attr/attr_provider.c b/src/libhydra/plugins/attr/attr_provider.c index ca3221979..1f333d03f 100644 --- a/src/libhydra/plugins/attr/attr_provider.c +++ b/src/libhydra/plugins/attr/attr_provider.c @@ -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> diff --git a/src/libhydra/plugins/attr_sql/attr_sql_plugin.c b/src/libhydra/plugins/attr_sql/attr_sql_plugin.c index c04ec9a01..69e6f7be6 100644 --- a/src/libhydra/plugins/attr_sql/attr_sql_plugin.c +++ b/src/libhydra/plugins/attr_sql/attr_sql_plugin.c @@ -14,7 +14,7 @@ */ #include <hydra.h> -#include <debug.h> +#include <utils/debug.h> #include "attr_sql_plugin.h" #include "sql_attribute.h" diff --git a/src/libhydra/plugins/attr_sql/pool.c b/src/libhydra/plugins/attr_sql/pool.c index 1d5fddbb7..f355e96e2 100644 --- a/src/libhydra/plugins/attr_sql/pool.c +++ b/src/libhydra/plugins/attr_sql/pool.c @@ -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> diff --git a/src/libhydra/plugins/attr_sql/sql_attribute.c b/src/libhydra/plugins/attr_sql/sql_attribute.c index a7d90e728..1a4ee7a51 100644 --- a/src/libhydra/plugins/attr_sql/sql_attribute.c +++ b/src/libhydra/plugins/attr_sql/sql_attribute.c @@ -15,7 +15,7 @@ #include <time.h> -#include <debug.h> +#include <utils/debug.h> #include <library.h> #include "sql_attribute.h" diff --git a/src/libhydra/plugins/kernel_klips/kernel_klips_ipsec.c b/src/libhydra/plugins/kernel_klips/kernel_klips_ipsec.c index 2c1d7e9b3..431174e72 100644 --- a/src/libhydra/plugins/kernel_klips/kernel_klips_ipsec.c +++ b/src/libhydra/plugins/kernel_klips/kernel_klips_ipsec.c @@ -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> diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c b/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c index 8cd19a245..f9b2634a0 100644 --- a/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c +++ b/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c @@ -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> diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c b/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c index b39ffa3ac..8b8ab2121 100644 --- a/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c +++ b/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c @@ -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> diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_shared.c b/src/libhydra/plugins/kernel_netlink/kernel_netlink_shared.c index 285f6c8b2..561e8529d 100644 --- a/src/libhydra/plugins/kernel_netlink/kernel_netlink_shared.c +++ b/src/libhydra/plugins/kernel_netlink/kernel_netlink_shared.c @@ -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; diff --git a/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c b/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c index e1a838419..71bdbbe2b 100644 --- a/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c +++ b/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c @@ -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> diff --git a/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c b/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c index 6d5245636..d45c5bb3f 100644 --- a/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c +++ b/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c @@ -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> diff --git a/src/libhydra/plugins/resolve/resolve_handler.c b/src/libhydra/plugins/resolve/resolve_handler.c index 0a3094fd7..6b8d6be7f 100644 --- a/src/libhydra/plugins/resolve/resolve_handler.c +++ b/src/libhydra/plugins/resolve/resolve_handler.c @@ -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 */ diff --git a/src/libimcv/ietf/ietf_attr_assess_result.c b/src/libimcv/ietf/ietf_attr_assess_result.c index 6893730bf..6f7764212 100644 --- a/src/libimcv/ietf/ietf_attr_assess_result.c +++ b/src/libimcv/ietf/ietf_attr_assess_result.c @@ -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; diff --git a/src/libimcv/ietf/ietf_attr_attr_request.c b/src/libimcv/ietf/ietf_attr_attr_request.c index 1b0931950..1c2d4f54c 100644 --- a/src/libimcv/ietf/ietf_attr_attr_request.c +++ b/src/libimcv/ietf/ietf_attr_attr_request.c @@ -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; diff --git a/src/libimcv/ietf/ietf_attr_default_pwd_enabled.c b/src/libimcv/ietf/ietf_attr_default_pwd_enabled.c index 4c0d7ebef..08a6eedd1 100644 --- a/src/libimcv/ietf/ietf_attr_default_pwd_enabled.c +++ b/src/libimcv/ietf/ietf_attr_default_pwd_enabled.c @@ -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; diff --git a/src/libimcv/ietf/ietf_attr_fwd_enabled.c b/src/libimcv/ietf/ietf_attr_fwd_enabled.c index c7deea07c..4f52206e2 100644 --- a/src/libimcv/ietf/ietf_attr_fwd_enabled.c +++ b/src/libimcv/ietf/ietf_attr_fwd_enabled.c @@ -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; diff --git a/src/libimcv/ietf/ietf_attr_installed_packages.c b/src/libimcv/ietf/ietf_attr_installed_packages.c index e0ff748f9..c19bd920e 100644 --- a/src/libimcv/ietf/ietf_attr_installed_packages.c +++ b/src/libimcv/ietf/ietf_attr_installed_packages.c @@ -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; diff --git a/src/libimcv/ietf/ietf_attr_numeric_version.c b/src/libimcv/ietf/ietf_attr_numeric_version.c index 7d851bb0f..9c03017a7 100644 --- a/src/libimcv/ietf/ietf_attr_numeric_version.c +++ b/src/libimcv/ietf/ietf_attr_numeric_version.c @@ -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; diff --git a/src/libimcv/ietf/ietf_attr_op_status.c b/src/libimcv/ietf/ietf_attr_op_status.c index 6c820a681..cf32190c3 100644 --- a/src/libimcv/ietf/ietf_attr_op_status.c +++ b/src/libimcv/ietf/ietf_attr_op_status.c @@ -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> diff --git a/src/libimcv/ietf/ietf_attr_pa_tnc_error.c b/src/libimcv/ietf/ietf_attr_pa_tnc_error.c index 46f5d6716..e2f6fc3ab 100644 --- a/src/libimcv/ietf/ietf_attr_pa_tnc_error.c +++ b/src/libimcv/ietf/ietf_attr_pa_tnc_error.c @@ -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*, diff --git a/src/libimcv/ietf/ietf_attr_port_filter.c b/src/libimcv/ietf/ietf_attr_port_filter.c index 34bcf895c..80b77f5ec 100644 --- a/src/libimcv/ietf/ietf_attr_port_filter.c +++ b/src/libimcv/ietf/ietf_attr_port_filter.c @@ -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; diff --git a/src/libimcv/ietf/ietf_attr_product_info.c b/src/libimcv/ietf/ietf_attr_product_info.c index 719619f99..23aac5153 100644 --- a/src/libimcv/ietf/ietf_attr_product_info.c +++ b/src/libimcv/ietf/ietf_attr_product_info.c @@ -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; diff --git a/src/libimcv/ietf/ietf_attr_remediation_instr.c b/src/libimcv/ietf/ietf_attr_remediation_instr.c index 7ec0b3cd8..fcb6d95ca 100644 --- a/src/libimcv/ietf/ietf_attr_remediation_instr.c +++ b/src/libimcv/ietf/ietf_attr_remediation_instr.c @@ -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; diff --git a/src/libimcv/ietf/ietf_attr_string_version.c b/src/libimcv/ietf/ietf_attr_string_version.c index 7cc3447f2..964abeb9a 100644 --- a/src/libimcv/ietf/ietf_attr_string_version.c +++ b/src/libimcv/ietf/ietf_attr_string_version.c @@ -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); diff --git a/src/libimcv/imc/imc_agent.c b/src/libimcv/imc/imc_agent.c index 911a5b03a..161623477 100644 --- a/src/libimcv/imc/imc_agent.c +++ b/src/libimcv/imc/imc_agent.c @@ -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); diff --git a/src/libimcv/imc/imc_msg.c b/src/libimcv/imc/imc_msg.c index 48a295575..60613d0f2 100644 --- a/src/libimcv/imc/imc_msg.c +++ b/src/libimcv/imc/imc_msg.c @@ -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; diff --git a/src/libimcv/imcv.c b/src/libimcv/imcv.c index b84548f9b..f9de41fa7 100644 --- a/src/libimcv/imcv.c +++ b/src/libimcv/imcv.c @@ -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(); } } diff --git a/src/libimcv/imv/imv_agent.c b/src/libimcv/imv/imv_agent.c index a21fb930e..d664dc9c1 100644 --- a/src/libimcv/imv/imv_agent.c +++ b/src/libimcv/imv/imv_agent.c @@ -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; diff --git a/src/libimcv/imv/imv_msg.c b/src/libimcv/imv/imv_msg.c index e69121a4b..911dbfd0c 100644 --- a/src/libimcv/imv/imv_msg.c +++ b/src/libimcv/imv/imv_msg.c @@ -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; diff --git a/src/libimcv/ita/ita_attr_command.c b/src/libimcv/ita/ita_attr_command.c index d43e4777b..586955706 100644 --- a/src/libimcv/ita/ita_attr_command.c +++ b/src/libimcv/ita/ita_attr_command.c @@ -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*, diff --git a/src/libimcv/ita/ita_attr_dummy.c b/src/libimcv/ita/ita_attr_dummy.c index f122256a1..4fb60a7e1 100644 --- a/src/libimcv/ita/ita_attr_dummy.c +++ b/src/libimcv/ita/ita_attr_dummy.c @@ -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*, diff --git a/src/libimcv/os_info/os_info.c b/src/libimcv/os_info/os_info.c index 8846c84cd..c0661dc38 100644 --- a/src/libimcv/os_info/os_info.c +++ b/src/libimcv/os_info/os_info.c @@ -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; diff --git a/src/libimcv/pa_tnc/pa_tnc_attr_manager.c b/src/libimcv/pa_tnc/pa_tnc_attr_manager.c index 3df660e01..900a55716 100644 --- a/src/libimcv/pa_tnc/pa_tnc_attr_manager.c +++ b/src/libimcv/pa_tnc/pa_tnc_attr_manager.c @@ -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; diff --git a/src/libimcv/pa_tnc/pa_tnc_msg.c b/src/libimcv/pa_tnc/pa_tnc_msg.c index b7cdd37c2..97d670e39 100644 --- a/src/libimcv/pa_tnc/pa_tnc_msg.c +++ b/src/libimcv/pa_tnc/pa_tnc_msg.c @@ -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; diff --git a/src/libimcv/plugins/imc_os/imc_os.c b/src/libimcv/plugins/imc_os/imc_os.c index acfa3e035..f50b8aa87 100644 --- a/src/libimcv/plugins/imc_os/imc_os.c +++ b/src/libimcv/plugins/imc_os/imc_os.c @@ -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) { diff --git a/src/libimcv/plugins/imc_os/imc_os_state.c b/src/libimcv/plugins/imc_os/imc_os_state.c index 859e1f87f..f49959ab9 100644 --- a/src/libimcv/plugins/imc_os/imc_os_state.c +++ b/src/libimcv/plugins/imc_os/imc_os_state.c @@ -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; } diff --git a/src/libimcv/plugins/imc_scanner/imc_scanner.c b/src/libimcv/plugins/imc_scanner/imc_scanner.c index c97dd0dea..5c7985e52 100644 --- a/src/libimcv/plugins/imc_scanner/imc_scanner.c +++ b/src/libimcv/plugins/imc_scanner/imc_scanner.c @@ -24,7 +24,7 @@ #include <pen/pen.h> #include <utils/lexparser.h> -#include <debug.h> +#include <utils/debug.h> #include <stdio.h> diff --git a/src/libimcv/plugins/imc_scanner/imc_scanner_state.c b/src/libimcv/plugins/imc_scanner/imc_scanner_state.c index d47c4ecdf..b5a6cdd20 100644 --- a/src/libimcv/plugins/imc_scanner/imc_scanner_state.c +++ b/src/libimcv/plugins/imc_scanner/imc_scanner_state.c @@ -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; } diff --git a/src/libimcv/plugins/imc_test/imc_test.c b/src/libimcv/plugins/imc_test/imc_test.c index 472354edc..87efaff7e 100644 --- a/src/libimcv/plugins/imc_test/imc_test.c +++ b/src/libimcv/plugins/imc_test/imc_test.c @@ -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 */ diff --git a/src/libimcv/plugins/imc_test/imc_test_state.c b/src/libimcv/plugins/imc_test/imc_test_state.c index fba018d1a..e7beca0aa 100644 --- a/src/libimcv/plugins/imc_test/imc_test_state.c +++ b/src/libimcv/plugins/imc_test/imc_test_state.c @@ -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; diff --git a/src/libimcv/plugins/imv_os/imv_os.c b/src/libimcv/plugins/imv_os/imv_os.c index 3bfe89d2e..2346918b8 100644 --- a/src/libimcv/plugins/imv_os/imv_os.c +++ b/src/libimcv/plugins/imv_os/imv_os.c @@ -35,7 +35,7 @@ #include <pen/pen.h> #include <collections/linked_list.h> -#include <debug.h> +#include <utils/debug.h> /* IMV definitions */ diff --git a/src/libimcv/plugins/imv_os/imv_os_state.c b/src/libimcv/plugins/imv_os/imv_os_state.c index 1c5c78106..e36d4aeb1 100644 --- a/src/libimcv/plugins/imv_os/imv_os_state.c +++ b/src/libimcv/plugins/imv_os/imv_os_state.c @@ -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; } diff --git a/src/libimcv/plugins/imv_scanner/imv_scanner.c b/src/libimcv/plugins/imv_scanner/imv_scanner.c index 4d9762cb6..1705d3008 100644 --- a/src/libimcv/plugins/imv_scanner/imv_scanner.c +++ b/src/libimcv/plugins/imv_scanner/imv_scanner.c @@ -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 */ diff --git a/src/libimcv/plugins/imv_scanner/imv_scanner_state.c b/src/libimcv/plugins/imv_scanner/imv_scanner_state.c index fecc84e70..fbb70d73e 100644 --- a/src/libimcv/plugins/imv_scanner/imv_scanner_state.c +++ b/src/libimcv/plugins/imv_scanner/imv_scanner_state.c @@ -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; } diff --git a/src/libimcv/plugins/imv_test/imv_test.c b/src/libimcv/plugins/imv_test/imv_test.c index 051600d4c..973edad2c 100644 --- a/src/libimcv/plugins/imv_test/imv_test.c +++ b/src/libimcv/plugins/imv_test/imv_test.c @@ -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))) { diff --git a/src/libimcv/plugins/imv_test/imv_test_state.c b/src/libimcv/plugins/imv_test/imv_test_state.c index 53d4c07b3..1fb6df859 100644 --- a/src/libimcv/plugins/imv_test/imv_test_state.c +++ b/src/libimcv/plugins/imv_test/imv_test_state.c @@ -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; diff --git a/src/libipsec/esp_context.c b/src/libipsec/esp_context.c index dc3ad3f8b..44b1117d9 100644 --- a/src/libipsec/esp_context.c +++ b/src/libipsec/esp_context.c @@ -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> diff --git a/src/libipsec/esp_packet.c b/src/libipsec/esp_packet.c index bfcab95eb..16cc687ef 100644 --- a/src/libipsec/esp_packet.c +++ b/src/libipsec/esp_packet.c @@ -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> diff --git a/src/libipsec/ip_packet.c b/src/libipsec/ip_packet.c index 096ca33a8..5c8cc2e3e 100644 --- a/src/libipsec/ip_packet.c +++ b/src/libipsec/ip_packet.c @@ -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> diff --git a/src/libipsec/ipsec.c b/src/libipsec/ipsec.c index 50d9163ea..6c9a26acf 100644 --- a/src/libipsec/ipsec.c +++ b/src/libipsec/ipsec.c @@ -17,7 +17,7 @@ #include "ipsec.h" -#include <debug.h> +#include <utils/debug.h> typedef struct private_ipsec_t private_ipsec_t; diff --git a/src/libipsec/ipsec_event_relay.c b/src/libipsec/ipsec_event_relay.c index 19643d5dd..d7d7e8276 100644 --- a/src/libipsec/ipsec_event_relay.c +++ b/src/libipsec/ipsec_event_relay.c @@ -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> diff --git a/src/libipsec/ipsec_policy.c b/src/libipsec/ipsec_policy.c index af8ea9f9d..8407921ac 100644 --- a/src/libipsec/ipsec_policy.c +++ b/src/libipsec/ipsec_policy.c @@ -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; diff --git a/src/libipsec/ipsec_policy_mgr.c b/src/libipsec/ipsec_policy_mgr.c index dd904ba39..72f94ec20 100644 --- a/src/libipsec/ipsec_policy_mgr.c +++ b/src/libipsec/ipsec_policy_mgr.c @@ -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> diff --git a/src/libipsec/ipsec_processor.c b/src/libipsec/ipsec_processor.c index 4d3649d4c..66f43a408 100644 --- a/src/libipsec/ipsec_processor.c +++ b/src/libipsec/ipsec_processor.c @@ -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> diff --git a/src/libipsec/ipsec_sa.c b/src/libipsec/ipsec_sa.c index 66852259c..2ff5cff55 100644 --- a/src/libipsec/ipsec_sa.c +++ b/src/libipsec/ipsec_sa.c @@ -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; diff --git a/src/libipsec/ipsec_sa_mgr.c b/src/libipsec/ipsec_sa_mgr.c index 32f2cdb73..28748971d 100644 --- a/src/libipsec/ipsec_sa_mgr.c +++ b/src/libipsec/ipsec_sa_mgr.c @@ -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> diff --git a/src/libpts/libpts.c b/src/libpts/libpts.c index 384ee4ed7..95110823c 100644 --- a/src/libpts/libpts.c +++ b/src/libpts/libpts.c @@ -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 diff --git a/src/libpts/plugins/imc_attestation/imc_attestation.c b/src/libpts/plugins/imc_attestation/imc_attestation.c index 9086f7263..5a3b91d6d 100644 --- a/src/libpts/plugins/imc_attestation/imc_attestation.c +++ b/src/libpts/plugins/imc_attestation/imc_attestation.c @@ -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 */ diff --git a/src/libpts/plugins/imc_attestation/imc_attestation_process.c b/src/libpts/plugins/imc_attestation/imc_attestation_process.c index 8ee02e467..88d24dd88 100644 --- a/src/libpts/plugins/imc_attestation/imc_attestation_process.c +++ b/src/libpts/plugins/imc_attestation/imc_attestation_process.c @@ -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; diff --git a/src/libpts/plugins/imc_attestation/imc_attestation_state.c b/src/libpts/plugins/imc_attestation/imc_attestation_state.c index 5ff50c0bc..4fcbdfa8a 100644 --- a/src/libpts/plugins/imc_attestation/imc_attestation_state.c +++ b/src/libpts/plugins/imc_attestation/imc_attestation_state.c @@ -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; diff --git a/src/libpts/plugins/imv_attestation/attest.c b/src/libpts/plugins/imv_attestation/attest.c index a202d128f..a93868817 100644 --- a/src/libpts/plugins/imv_attestation/attest.c +++ b/src/libpts/plugins/imv_attestation/attest.c @@ -22,7 +22,7 @@ #include <syslog.h> #include <library.h> -#include <debug.h> +#include <utils/debug.h> #include <imcv.h> #include <libpts.h> diff --git a/src/libpts/plugins/imv_attestation/imv_attestation.c b/src/libpts/plugins/imv_attestation/imv_attestation.c index e3536d164..647faf470 100644 --- a/src/libpts/plugins/imv_attestation/imv_attestation.c +++ b/src/libpts/plugins/imv_attestation/imv_attestation.c @@ -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> diff --git a/src/libpts/plugins/imv_attestation/imv_attestation_build.c b/src/libpts/plugins/imv_attestation/imv_attestation_build.c index 2f3672445..b4feec7cd 100644 --- a/src/libpts/plugins/imv_attestation/imv_attestation_build.c +++ b/src/libpts/plugins/imv_attestation/imv_attestation_build.c @@ -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); diff --git a/src/libpts/plugins/imv_attestation/imv_attestation_process.c b/src/libpts/plugins/imv_attestation/imv_attestation_process.c index 39ba9f014..db623f71f 100644 --- a/src/libpts/plugins/imv_attestation/imv_attestation_process.c +++ b/src/libpts/plugins/imv_attestation/imv_attestation_process.c @@ -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); diff --git a/src/libpts/plugins/imv_attestation/imv_attestation_state.c b/src/libpts/plugins/imv_attestation/imv_attestation_state.c index d5724f6ba..1c40f3ffa 100644 --- a/src/libpts/plugins/imv_attestation/imv_attestation_state.c +++ b/src/libpts/plugins/imv_attestation/imv_attestation_state.c @@ -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; diff --git a/src/libpts/pts/components/ita/ita_comp_ima.c b/src/libpts/pts/components/ita/ita_comp_ima.c index ad5d98888..02470f5f5 100644 --- a/src/libpts/pts/components/ita/ita_comp_ima.c +++ b/src/libpts/pts/components/ita/ita_comp_ima.c @@ -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); diff --git a/src/libpts/pts/components/ita/ita_comp_tboot.c b/src/libpts/pts/components/ita/ita_comp_tboot.c index 9deeb19b5..8fb5abddf 100644 --- a/src/libpts/pts/components/ita/ita_comp_tboot.c +++ b/src/libpts/pts/components/ita/ita_comp_tboot.c @@ -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); diff --git a/src/libpts/pts/components/ita/ita_comp_tgrub.c b/src/libpts/pts/components/ita/ita_comp_tgrub.c index 986f7ace2..e3acd8774 100644 --- a/src/libpts/pts/components/ita/ita_comp_tgrub.c +++ b/src/libpts/pts/components/ita/ita_comp_tgrub.c @@ -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; } diff --git a/src/libpts/pts/components/pts_comp_evidence.c b/src/libpts/pts/components/pts_comp_evidence.c index 050717472..08c3d5e9a 100644 --- a/src/libpts/pts/components/pts_comp_evidence.c +++ b/src/libpts/pts/components/pts_comp_evidence.c @@ -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; diff --git a/src/libpts/pts/components/pts_comp_func_name.c b/src/libpts/pts/components/pts_comp_func_name.c index 7501be044..6c630f8fb 100644 --- a/src/libpts/pts/components/pts_comp_func_name.c +++ b/src/libpts/pts/components/pts_comp_func_name.c @@ -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; diff --git a/src/libpts/pts/components/pts_component_manager.c b/src/libpts/pts/components/pts_component_manager.c index 40fea1cec..9c1375b79 100644 --- a/src/libpts/pts/components/pts_component_manager.c +++ b/src/libpts/pts/components/pts_component_manager.c @@ -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; diff --git a/src/libpts/pts/pts.c b/src/libpts/pts/pts.c index 7d5c7b942..d7537b5b1 100644 --- a/src/libpts/pts/pts.c +++ b/src/libpts/pts/pts.c @@ -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> diff --git a/src/libpts/pts/pts_creds.c b/src/libpts/pts/pts_creds.c index 5a6197bdb..bc483eb84 100644 --- a/src/libpts/pts/pts_creds.c +++ b/src/libpts/pts/pts_creds.c @@ -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> diff --git a/src/libpts/pts/pts_database.c b/src/libpts/pts/pts_database.c index 946f37e1e..e0778aaef 100644 --- a/src/libpts/pts/pts_database.c +++ b/src/libpts/pts/pts_database.c @@ -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) " diff --git a/src/libpts/pts/pts_dh_group.c b/src/libpts/pts/pts_dh_group.c index fb141327f..41a436036 100644 --- a/src/libpts/pts/pts_dh_group.c +++ b/src/libpts/pts/pts_dh_group.c @@ -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); diff --git a/src/libpts/pts/pts_file_meas.c b/src/libpts/pts/pts_file_meas.c index 344914fc6..e69c32443 100644 --- a/src/libpts/pts/pts_file_meas.c +++ b/src/libpts/pts/pts_file_meas.c @@ -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> diff --git a/src/libpts/pts/pts_file_meta.c b/src/libpts/pts/pts_file_meta.c index c97c2d770..9cca0a5a5 100644 --- a/src/libpts/pts/pts_file_meta.c +++ b/src/libpts/pts/pts_file_meta.c @@ -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; diff --git a/src/libpts/pts/pts_meas_algo.c b/src/libpts/pts/pts_meas_algo.c index fbc9c6959..16a66e7b3 100644 --- a/src/libpts/pts/pts_meas_algo.c +++ b/src/libpts/pts/pts_meas_algo.c @@ -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); diff --git a/src/libpts/pts/pts_pcr.c b/src/libpts/pts/pts_pcr.c index a7a2f5fae..0af93b608 100644 --- a/src/libpts/pts/pts_pcr.c +++ b/src/libpts/pts/pts_pcr.c @@ -15,7 +15,7 @@ #include "pts_pcr.h" -#include <debug.h> +#include <utils/debug.h> #include <stdarg.h> diff --git a/src/libpts/tcg/tcg_pts_attr_aik.c b/src/libpts/tcg/tcg_pts_attr_aik.c index 75f3f179c..d5bbdc9cd 100644 --- a/src/libpts/tcg/tcg_pts_attr_aik.c +++ b/src/libpts/tcg/tcg_pts_attr_aik.c @@ -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"); diff --git a/src/libpts/tcg/tcg_pts_attr_dh_nonce_finish.c b/src/libpts/tcg/tcg_pts_attr_dh_nonce_finish.c index 3ca255cba..4d7281243 100644 --- a/src/libpts/tcg/tcg_pts_attr_dh_nonce_finish.c +++ b/src/libpts/tcg/tcg_pts_attr_dh_nonce_finish.c @@ -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); } diff --git a/src/libpts/tcg/tcg_pts_attr_dh_nonce_params_req.c b/src/libpts/tcg/tcg_pts_attr_dh_nonce_params_req.c index 828c09605..7796dbaab 100644 --- a/src/libpts/tcg/tcg_pts_attr_dh_nonce_params_req.c +++ b/src/libpts/tcg/tcg_pts_attr_dh_nonce_params_req.c @@ -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); } diff --git a/src/libpts/tcg/tcg_pts_attr_dh_nonce_params_resp.c b/src/libpts/tcg/tcg_pts_attr_dh_nonce_params_resp.c index 66ac185b3..1e82e7098 100644 --- a/src/libpts/tcg/tcg_pts_attr_dh_nonce_params_resp.c +++ b/src/libpts/tcg/tcg_pts_attr_dh_nonce_params_resp.c @@ -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); } diff --git a/src/libpts/tcg/tcg_pts_attr_file_meas.c b/src/libpts/tcg/tcg_pts_attr_file_meas.c index 8138a5f2e..3cc13be4a 100644 --- a/src/libpts/tcg/tcg_pts_attr_file_meas.c +++ b/src/libpts/tcg/tcg_pts_attr_file_meas.c @@ -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; diff --git a/src/libpts/tcg/tcg_pts_attr_gen_attest_evid.c b/src/libpts/tcg/tcg_pts_attr_gen_attest_evid.c index 5eac5ecae..9103e06b2 100644 --- a/src/libpts/tcg/tcg_pts_attr_gen_attest_evid.c +++ b/src/libpts/tcg/tcg_pts_attr_gen_attest_evid.c @@ -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"); diff --git a/src/libpts/tcg/tcg_pts_attr_get_aik.c b/src/libpts/tcg/tcg_pts_attr_get_aik.c index 4b5eae7a7..6f35f5419 100644 --- a/src/libpts/tcg/tcg_pts_attr_get_aik.c +++ b/src/libpts/tcg/tcg_pts_attr_get_aik.c @@ -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"); diff --git a/src/libpts/tcg/tcg_pts_attr_get_tpm_version_info.c b/src/libpts/tcg/tcg_pts_attr_get_tpm_version_info.c index 0cfc7efa9..4dd64e3a7 100644 --- a/src/libpts/tcg/tcg_pts_attr_get_tpm_version_info.c +++ b/src/libpts/tcg/tcg_pts_attr_get_tpm_version_info.c @@ -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"); diff --git a/src/libpts/tcg/tcg_pts_attr_meas_algo.c b/src/libpts/tcg/tcg_pts_attr_meas_algo.c index bb95adc9e..abef45bdd 100644 --- a/src/libpts/tcg/tcg_pts_attr_meas_algo.c +++ b/src/libpts/tcg/tcg_pts_attr_meas_algo.c @@ -18,12 +18,12 @@ #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 */ diff --git a/src/libpts/tcg/tcg_pts_attr_proto_caps.c b/src/libpts/tcg/tcg_pts_attr_proto_caps.c index 83665ff69..360883282 100644 --- a/src/libpts/tcg/tcg_pts_attr_proto_caps.c +++ b/src/libpts/tcg/tcg_pts_attr_proto_caps.c @@ -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); } diff --git a/src/libpts/tcg/tcg_pts_attr_req_file_meas.c b/src/libpts/tcg/tcg_pts_attr_req_file_meas.c index 65bdff579..c28a40f03 100644 --- a/src/libpts/tcg/tcg_pts_attr_req_file_meas.c +++ b/src/libpts/tcg/tcg_pts_attr_req_file_meas.c @@ -18,14 +18,14 @@ #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"); diff --git a/src/libpts/tcg/tcg_pts_attr_req_file_meta.c b/src/libpts/tcg/tcg_pts_attr_req_file_meta.c index eb5114172..0ab8bef83 100644 --- a/src/libpts/tcg/tcg_pts_attr_req_file_meta.c +++ b/src/libpts/tcg/tcg_pts_attr_req_file_meta.c @@ -18,14 +18,14 @@ #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) != diff --git a/src/libpts/tcg/tcg_pts_attr_req_func_comp_evid.c b/src/libpts/tcg/tcg_pts_attr_req_func_comp_evid.c index 378168375..8bb43aef8 100644 --- a/src/libpts/tcg/tcg_pts_attr_req_func_comp_evid.c +++ b/src/libpts/tcg/tcg_pts_attr_req_func_comp_evid.c @@ -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; diff --git a/src/libpts/tcg/tcg_pts_attr_simple_comp_evid.c b/src/libpts/tcg/tcg_pts_attr_simple_comp_evid.c index 387f4a115..c4f96789a 100644 --- a/src/libpts/tcg/tcg_pts_attr_simple_comp_evid.c +++ b/src/libpts/tcg/tcg_pts_attr_simple_comp_evid.c @@ -18,16 +18,16 @@ #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 = { diff --git a/src/libpts/tcg/tcg_pts_attr_simple_evid_final.c b/src/libpts/tcg/tcg_pts_attr_simple_evid_final.c index 8d2d4f82d..8c76651d6 100644 --- a/src/libpts/tcg/tcg_pts_attr_simple_evid_final.c +++ b/src/libpts/tcg/tcg_pts_attr_simple_evid_final.c @@ -19,14 +19,14 @@ #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; diff --git a/src/libpts/tcg/tcg_pts_attr_tpm_version_info.c b/src/libpts/tcg/tcg_pts_attr_tpm_version_info.c index 8d1e78f18..5143e1676 100644 --- a/src/libpts/tcg/tcg_pts_attr_tpm_version_info.c +++ b/src/libpts/tcg/tcg_pts_attr_tpm_version_info.c @@ -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"); diff --git a/src/libpts/tcg/tcg_pts_attr_unix_file_meta.c b/src/libpts/tcg/tcg_pts_attr_unix_file_meta.c index 51088e628..9e15f3c17 100644 --- a/src/libpts/tcg/tcg_pts_attr_unix_file_meta.c +++ b/src/libpts/tcg/tcg_pts_attr_unix_file_meta.c @@ -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; diff --git a/src/libradius/radius_client.c b/src/libradius/radius_client.c index 442cb12ce..1478c3d9e 100644 --- a/src/libradius/radius_client.c +++ b/src/libradius/radius_client.c @@ -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> diff --git a/src/libradius/radius_message.c b/src/libradius/radius_message.c index 77f9b0398..059dcda4b 100644 --- a/src/libradius/radius_message.c +++ b/src/libradius/radius_message.c @@ -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; diff --git a/src/libradius/radius_socket.c b/src/libradius/radius_socket.c index ba7cb14b0..7dab968d8 100644 --- a/src/libradius/radius_socket.c +++ b/src/libradius/radius_socket.c @@ -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; diff --git a/src/libsimaka/simaka_crypto.c b/src/libsimaka/simaka_crypto.c index 92db19317..8b47198df 100644 --- a/src/libsimaka/simaka_crypto.c +++ b/src/libsimaka/simaka_crypto.c @@ -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 diff --git a/src/libsimaka/simaka_manager.c b/src/libsimaka/simaka_manager.c index e10ab21b8..e85dd660b 100644 --- a/src/libsimaka/simaka_manager.c +++ b/src/libsimaka/simaka_manager.c @@ -15,7 +15,7 @@ #include "simaka_manager.h" -#include <debug.h> +#include <utils/debug.h> #include <collections/linked_list.h> #include <threading/rwlock.h> diff --git a/src/libsimaka/simaka_message.c b/src/libsimaka/simaka_message.c index e7c7a0a8c..7dd15480b 100644 --- a/src/libsimaka/simaka_message.c +++ b/src/libsimaka/simaka_message.c @@ -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; diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk index 3d01b2ada..f024f2cfb 100644 --- a/src/libstrongswan/Android.mk +++ b/src/libstrongswan/Android.mk @@ -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 diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am index 153f6c9d4..205cb6467 100644 --- a/src/libstrongswan/Makefile.am +++ b/src/libstrongswan/Makefile.am @@ -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 diff --git a/src/libstrongswan/asn1/asn1.c b/src/libstrongswan/asn1/asn1.c index c9f6fce25..f438cb20e 100644 --- a/src/libstrongswan/asn1/asn1.c +++ b/src/libstrongswan/asn1/asn1.c @@ -19,7 +19,7 @@ #include <string.h> #include <time.h> -#include <debug.h> +#include <utils/debug.h> #include "oid.h" #include "asn1.h" diff --git a/src/libstrongswan/asn1/asn1_parser.c b/src/libstrongswan/asn1/asn1_parser.c index 40e11b321..c31fb75f0 100644 --- a/src/libstrongswan/asn1/asn1_parser.c +++ b/src/libstrongswan/asn1/asn1_parser.c @@ -19,7 +19,7 @@ #include <string.h> #include <time.h> -#include <debug.h> +#include <utils/debug.h> #include "asn1.h" #include "asn1_parser.h" diff --git a/src/libstrongswan/bio/bio_reader.c b/src/libstrongswan/bio/bio_reader.c index 3a62bb541..17815d6c0 100644 --- a/src/libstrongswan/bio/bio_reader.c +++ b/src/libstrongswan/bio/bio_reader.c @@ -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; diff --git a/src/libstrongswan/collections/enumerator.c b/src/libstrongswan/collections/enumerator.c index 53c94f9dd..f80cdabd2 100644 --- a/src/libstrongswan/collections/enumerator.c +++ b/src/libstrongswan/collections/enumerator.c @@ -25,7 +25,7 @@ #include <errno.h> #include <string.h> -#include <debug.h> +#include <utils/debug.h> /** * Implementation of enumerator_create_empty().enumerate diff --git a/src/libstrongswan/credentials/auth_cfg.c b/src/libstrongswan/credentials/auth_cfg.c index 9d1714339..a718de3dc 100644 --- a/src/libstrongswan/credentials/auth_cfg.c +++ b/src/libstrongswan/credentials/auth_cfg.c @@ -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> diff --git a/src/libstrongswan/credentials/certificates/certificate.c b/src/libstrongswan/credentials/certificates/certificate.c index 33ba4e907..bc4209ca7 100644 --- a/src/libstrongswan/credentials/certificates/certificate.c +++ b/src/libstrongswan/credentials/certificates/certificate.c @@ -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, diff --git a/src/libstrongswan/credentials/certificates/crl.c b/src/libstrongswan/credentials/certificates/crl.c index 69bd80b84..09fd0bfc8 100644 --- a/src/libstrongswan/credentials/certificates/crl.c +++ b/src/libstrongswan/credentials/certificates/crl.c @@ -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", diff --git a/src/libstrongswan/credentials/credential_factory.c b/src/libstrongswan/credentials/credential_factory.c index cb52b4182..71a3f9e07 100644 --- a/src/libstrongswan/credentials/credential_factory.c +++ b/src/libstrongswan/credentials/credential_factory.c @@ -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> diff --git a/src/libstrongswan/credentials/credential_manager.c b/src/libstrongswan/credentials/credential_manager.c index 32dadc770..9e40c5a10 100644 --- a/src/libstrongswan/credentials/credential_manager.c +++ b/src/libstrongswan/credentials/credential_manager.c @@ -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> diff --git a/src/libstrongswan/credentials/sets/auth_cfg_wrapper.c b/src/libstrongswan/credentials/sets/auth_cfg_wrapper.c index 2cef23328..46bfb5c6e 100644 --- a/src/libstrongswan/credentials/sets/auth_cfg_wrapper.c +++ b/src/libstrongswan/credentials/sets/auth_cfg_wrapper.c @@ -15,7 +15,7 @@ */ #include <library.h> -#include <debug.h> +#include <utils/debug.h> #include "auth_cfg_wrapper.h" diff --git a/src/libstrongswan/crypto/aead.c b/src/libstrongswan/crypto/aead.c index 02fb8d50a..32a0e6759 100644 --- a/src/libstrongswan/crypto/aead.c +++ b/src/libstrongswan/crypto/aead.c @@ -15,7 +15,7 @@ #include "aead.h" -#include <debug.h> +#include <utils/debug.h> typedef struct private_aead_t private_aead_t; diff --git a/src/libstrongswan/crypto/crypto_factory.c b/src/libstrongswan/crypto/crypto_factory.c index 48300b089..5a363e9f0 100644 --- a/src/libstrongswan/crypto/crypto_factory.c +++ b/src/libstrongswan/crypto/crypto_factory.c @@ -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> diff --git a/src/libstrongswan/crypto/crypto_tester.c b/src/libstrongswan/crypto/crypto_tester.c index 56f0dedda..08b226468 100644 --- a/src/libstrongswan/crypto/crypto_tester.c +++ b/src/libstrongswan/crypto/crypto_tester.c @@ -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; diff --git a/src/libstrongswan/crypto/pkcs7.c b/src/libstrongswan/crypto/pkcs7.c index 674fe04ed..687603589 100644 --- a/src/libstrongswan/crypto/pkcs7.c +++ b/src/libstrongswan/crypto/pkcs7.c @@ -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> diff --git a/src/libstrongswan/crypto/pkcs9.c b/src/libstrongswan/crypto/pkcs9.c index f3cc5d2f7..73dfdc447 100644 --- a/src/libstrongswan/crypto/pkcs9.c +++ b/src/libstrongswan/crypto/pkcs9.c @@ -15,7 +15,7 @@ */ #include <library.h> -#include <debug.h> +#include <utils/debug.h> #include <asn1/oid.h> #include <asn1/asn1.h> diff --git a/src/libstrongswan/eap/eap.c b/src/libstrongswan/eap/eap.c index 1e4cf11bf..c181c5de7 100644 --- a/src/libstrongswan/eap/eap.c +++ b/src/libstrongswan/eap/eap.c @@ -19,7 +19,7 @@ #include "eap.h" -#include <debug.h> +#include <utils/debug.h> ENUM(eap_code_names, EAP_REQUEST, EAP_FAILURE, "EAP_REQUEST", diff --git a/src/libstrongswan/fetcher/fetcher_manager.c b/src/libstrongswan/fetcher/fetcher_manager.c index ec1b5af59..a638eef2f 100644 --- a/src/libstrongswan/fetcher/fetcher_manager.c +++ b/src/libstrongswan/fetcher/fetcher_manager.c @@ -15,7 +15,7 @@ #include "fetcher_manager.h" -#include <debug.h> +#include <utils/debug.h> #include <threading/rwlock.h> #include <collections/linked_list.h> diff --git a/src/libstrongswan/library.c b/src/libstrongswan/library.c index db0c84545..2a8dda7e1 100644 --- a/src/libstrongswan/library.c +++ b/src/libstrongswan/library.c @@ -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> diff --git a/src/libstrongswan/networking/host.c b/src/libstrongswan/networking/host.c index 1d0614001..66a8ff1f5 100644 --- a/src/libstrongswan/networking/host.c +++ b/src/libstrongswan/networking/host.c @@ -18,7 +18,7 @@ #include "host.h" -#include <debug.h> +#include <utils/debug.h> #include <library.h> #define IPV4_LEN 4 diff --git a/src/libstrongswan/networking/host_resolver.c b/src/libstrongswan/networking/host_resolver.c index c12beccba..73ca3326b 100644 --- a/src/libstrongswan/networking/host_resolver.c +++ b/src/libstrongswan/networking/host_resolver.c @@ -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> diff --git a/src/libstrongswan/networking/tun_device.c b/src/libstrongswan/networking/tun_device.c index 36f3359c0..d07327e5c 100644 --- a/src/libstrongswan/networking/tun_device.c +++ b/src/libstrongswan/networking/tun_device.c @@ -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 diff --git a/src/libstrongswan/plugins/af_alg/af_alg_ops.c b/src/libstrongswan/plugins/af_alg/af_alg_ops.c index 7fe47c578..331d1e801 100644 --- a/src/libstrongswan/plugins/af_alg/af_alg_ops.c +++ b/src/libstrongswan/plugins/af_alg/af_alg_ops.c @@ -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; diff --git a/src/libstrongswan/plugins/agent/agent_private_key.c b/src/libstrongswan/plugins/agent/agent_private_key.c index 8d49431b3..42c78c172 100644 --- a/src/libstrongswan/plugins/agent/agent_private_key.c +++ b/src/libstrongswan/plugins/agent/agent_private_key.c @@ -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 diff --git a/src/libstrongswan/plugins/cmac/cmac.c b/src/libstrongswan/plugins/cmac/cmac.c index 725d02d76..c8cb7fbf2 100644 --- a/src/libstrongswan/plugins/cmac/cmac.c +++ b/src/libstrongswan/plugins/cmac/cmac.c @@ -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> diff --git a/src/libstrongswan/plugins/constraints/constraints_validator.c b/src/libstrongswan/plugins/constraints/constraints_validator.c index 5d697fdd0..83a74299a 100644 --- a/src/libstrongswan/plugins/constraints/constraints_validator.c +++ b/src/libstrongswan/plugins/constraints/constraints_validator.c @@ -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> diff --git a/src/libstrongswan/plugins/curl/curl_fetcher.c b/src/libstrongswan/plugins/curl/curl_fetcher.c index 7f8c0aec2..c68b74f96 100644 --- a/src/libstrongswan/plugins/curl/curl_fetcher.c +++ b/src/libstrongswan/plugins/curl/curl_fetcher.c @@ -17,7 +17,7 @@ #include <curl/curl.h> #include <library.h> -#include <debug.h> +#include <utils/debug.h> #include "curl_fetcher.h" diff --git a/src/libstrongswan/plugins/curl/curl_plugin.c b/src/libstrongswan/plugins/curl/curl_plugin.c index 8628c4bb5..062fe129f 100644 --- a/src/libstrongswan/plugins/curl/curl_plugin.c +++ b/src/libstrongswan/plugins/curl/curl_plugin.c @@ -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> diff --git a/src/libstrongswan/plugins/dnskey/dnskey_builder.c b/src/libstrongswan/plugins/dnskey/dnskey_builder.c index ea4eb6cda..b8a451500 100644 --- a/src/libstrongswan/plugins/dnskey/dnskey_builder.c +++ b/src/libstrongswan/plugins/dnskey/dnskey_builder.c @@ -15,7 +15,7 @@ #include "dnskey_builder.h" -#include <debug.h> +#include <utils/debug.h> #include <credentials/keys/private_key.h> diff --git a/src/libstrongswan/plugins/fips_prf/fips_prf.c b/src/libstrongswan/plugins/fips_prf/fips_prf.c index 3fe204d35..23825078e 100644 --- a/src/libstrongswan/plugins/fips_prf/fips_prf.c +++ b/src/libstrongswan/plugins/fips_prf/fips_prf.c @@ -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; diff --git a/src/libstrongswan/plugins/gcrypt/gcrypt_crypter.c b/src/libstrongswan/plugins/gcrypt/gcrypt_crypter.c index 0b5dc0365..a737cb13d 100644 --- a/src/libstrongswan/plugins/gcrypt/gcrypt_crypter.c +++ b/src/libstrongswan/plugins/gcrypt/gcrypt_crypter.c @@ -17,7 +17,7 @@ #include <gcrypt.h> -#include <debug.h> +#include <utils/debug.h> typedef struct private_gcrypt_crypter_t private_gcrypt_crypter_t; diff --git a/src/libstrongswan/plugins/gcrypt/gcrypt_dh.c b/src/libstrongswan/plugins/gcrypt/gcrypt_dh.c index 0efd3ba16..f418b941d 100644 --- a/src/libstrongswan/plugins/gcrypt/gcrypt_dh.c +++ b/src/libstrongswan/plugins/gcrypt/gcrypt_dh.c @@ -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; diff --git a/src/libstrongswan/plugins/gcrypt/gcrypt_hasher.c b/src/libstrongswan/plugins/gcrypt/gcrypt_hasher.c index 3155a4aa0..af7993101 100644 --- a/src/libstrongswan/plugins/gcrypt/gcrypt_hasher.c +++ b/src/libstrongswan/plugins/gcrypt/gcrypt_hasher.c @@ -15,7 +15,7 @@ #include "gcrypt_hasher.h" -#include <debug.h> +#include <utils/debug.h> #include <gcrypt.h> diff --git a/src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c b/src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c index 5ebdcebce..78d75a238 100644 --- a/src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c +++ b/src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c @@ -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> diff --git a/src/libstrongswan/plugins/gcrypt/gcrypt_rsa_private_key.c b/src/libstrongswan/plugins/gcrypt/gcrypt_rsa_private_key.c index 9fdb2d45b..938a46490 100644 --- a/src/libstrongswan/plugins/gcrypt/gcrypt_rsa_private_key.c +++ b/src/libstrongswan/plugins/gcrypt/gcrypt_rsa_private_key.c @@ -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> diff --git a/src/libstrongswan/plugins/gcrypt/gcrypt_rsa_public_key.c b/src/libstrongswan/plugins/gcrypt/gcrypt_rsa_public_key.c index c54f2c0cf..291287a8f 100644 --- a/src/libstrongswan/plugins/gcrypt/gcrypt_rsa_public_key.c +++ b/src/libstrongswan/plugins/gcrypt/gcrypt_rsa_public_key.c @@ -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> diff --git a/src/libstrongswan/plugins/gmp/gmp_diffie_hellman.c b/src/libstrongswan/plugins/gmp/gmp_diffie_hellman.c index 7d232e4f1..b74d35169 100644 --- a/src/libstrongswan/plugins/gmp/gmp_diffie_hellman.c +++ b/src/libstrongswan/plugins/gmp/gmp_diffie_hellman.c @@ -21,7 +21,7 @@ #include "gmp_diffie_hellman.h" -#include <debug.h> +#include <utils/debug.h> #ifdef HAVE_MPZ_POWM_SEC # undef mpz_powm diff --git a/src/libstrongswan/plugins/gmp/gmp_rsa_private_key.c b/src/libstrongswan/plugins/gmp/gmp_rsa_private_key.c index 590ab6cb4..6ecf4ec52 100644 --- a/src/libstrongswan/plugins/gmp/gmp_rsa_private_key.c +++ b/src/libstrongswan/plugins/gmp/gmp_rsa_private_key.c @@ -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> diff --git a/src/libstrongswan/plugins/gmp/gmp_rsa_public_key.c b/src/libstrongswan/plugins/gmp/gmp_rsa_public_key.c index 2d84f0025..494b0164a 100644 --- a/src/libstrongswan/plugins/gmp/gmp_rsa_public_key.c +++ b/src/libstrongswan/plugins/gmp/gmp_rsa_public_key.c @@ -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> diff --git a/src/libstrongswan/plugins/ldap/ldap_fetcher.c b/src/libstrongswan/plugins/ldap/ldap_fetcher.c index 75f964853..40b6d1f63 100644 --- a/src/libstrongswan/plugins/ldap/ldap_fetcher.c +++ b/src/libstrongswan/plugins/ldap/ldap_fetcher.c @@ -22,7 +22,7 @@ #include <errno.h> #include <library.h> -#include <debug.h> +#include <utils/debug.h> #include "ldap_fetcher.h" diff --git a/src/libstrongswan/plugins/mysql/mysql_database.c b/src/libstrongswan/plugins/mysql/mysql_database.c index d31e1eb33..7e1da683e 100644 --- a/src/libstrongswan/plugins/mysql/mysql_database.c +++ b/src/libstrongswan/plugins/mysql/mysql_database.c @@ -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> diff --git a/src/libstrongswan/plugins/mysql/mysql_plugin.c b/src/libstrongswan/plugins/mysql/mysql_plugin.c index dd8b32761..23d709739 100644 --- a/src/libstrongswan/plugins/mysql/mysql_plugin.c +++ b/src/libstrongswan/plugins/mysql/mysql_plugin.c @@ -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; diff --git a/src/libstrongswan/plugins/nonce/nonce_nonceg.c b/src/libstrongswan/plugins/nonce/nonce_nonceg.c index 0402e3574..64ed2e08d 100644 --- a/src/libstrongswan/plugins/nonce/nonce_nonceg.c +++ b/src/libstrongswan/plugins/nonce/nonce_nonceg.c @@ -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; diff --git a/src/libstrongswan/plugins/openssl/openssl_crl.c b/src/libstrongswan/plugins/openssl/openssl_crl.c index 1956bf625..d4f36f58b 100644 --- a/src/libstrongswan/plugins/openssl/openssl_crl.c +++ b/src/libstrongswan/plugins/openssl/openssl_crl.c @@ -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> diff --git a/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c b/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c index b27aa3391..4dc5663f1 100644 --- a/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c +++ b/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c @@ -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; diff --git a/src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c b/src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c index 9e4067589..d846278c8 100644 --- a/src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c +++ b/src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c @@ -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; diff --git a/src/libstrongswan/plugins/openssl/openssl_ec_private_key.c b/src/libstrongswan/plugins/openssl/openssl_ec_private_key.c index 950504573..d350d050b 100644 --- a/src/libstrongswan/plugins/openssl/openssl_ec_private_key.c +++ b/src/libstrongswan/plugins/openssl/openssl_ec_private_key.c @@ -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> diff --git a/src/libstrongswan/plugins/openssl/openssl_ec_public_key.c b/src/libstrongswan/plugins/openssl/openssl_ec_public_key.c index 9cb68a3ab..3f5125b31 100644 --- a/src/libstrongswan/plugins/openssl/openssl_ec_public_key.c +++ b/src/libstrongswan/plugins/openssl/openssl_ec_public_key.c @@ -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> diff --git a/src/libstrongswan/plugins/openssl/openssl_plugin.c b/src/libstrongswan/plugins/openssl/openssl_plugin.c index b69de981e..1f7497a70 100644 --- a/src/libstrongswan/plugins/openssl/openssl_plugin.c +++ b/src/libstrongswan/plugins/openssl/openssl_plugin.c @@ -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" diff --git a/src/libstrongswan/plugins/openssl/openssl_rng.c b/src/libstrongswan/plugins/openssl/openssl_rng.c index c83244f60..d3d64f5e8 100644 --- a/src/libstrongswan/plugins/openssl/openssl_rng.c +++ b/src/libstrongswan/plugins/openssl/openssl_rng.c @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -#include <debug.h> +#include <utils/debug.h> #include <openssl/rand.h> #include <openssl/err.h> diff --git a/src/libstrongswan/plugins/openssl/openssl_rsa_private_key.c b/src/libstrongswan/plugins/openssl/openssl_rsa_private_key.c index 98cd700bf..926e5928c 100644 --- a/src/libstrongswan/plugins/openssl/openssl_rsa_private_key.c +++ b/src/libstrongswan/plugins/openssl/openssl_rsa_private_key.c @@ -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> diff --git a/src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c b/src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c index 5872a8159..0da5d2514 100644 --- a/src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c +++ b/src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c @@ -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> diff --git a/src/libstrongswan/plugins/openssl/openssl_util.c b/src/libstrongswan/plugins/openssl/openssl_util.c index 1eb1c6723..bc10dd28c 100644 --- a/src/libstrongswan/plugins/openssl/openssl_util.c +++ b/src/libstrongswan/plugins/openssl/openssl_util.c @@ -16,7 +16,7 @@ #include "openssl_util.h" -#include <debug.h> +#include <utils/debug.h> #include <openssl/evp.h> #include <openssl/x509.h> diff --git a/src/libstrongswan/plugins/openssl/openssl_x509.c b/src/libstrongswan/plugins/openssl/openssl_x509.c index a7c99a1ef..b847c0a63 100644 --- a/src/libstrongswan/plugins/openssl/openssl_x509.c +++ b/src/libstrongswan/plugins/openssl/openssl_x509.c @@ -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> diff --git a/src/libstrongswan/plugins/padlock/padlock_plugin.c b/src/libstrongswan/plugins/padlock/padlock_plugin.c index 9d4afd8e8..b887c2c84 100644 --- a/src/libstrongswan/plugins/padlock/padlock_plugin.c +++ b/src/libstrongswan/plugins/padlock/padlock_plugin.c @@ -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; diff --git a/src/libstrongswan/plugins/pem/pem_builder.c b/src/libstrongswan/plugins/pem/pem_builder.c index eefb2eb48..08e81b3c5 100644 --- a/src/libstrongswan/plugins/pem/pem_builder.c +++ b/src/libstrongswan/plugins/pem/pem_builder.c @@ -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> diff --git a/src/libstrongswan/plugins/pgp/pgp_builder.c b/src/libstrongswan/plugins/pgp/pgp_builder.c index f358dc764..3ff357202 100644 --- a/src/libstrongswan/plugins/pgp/pgp_builder.c +++ b/src/libstrongswan/plugins/pgp/pgp_builder.c @@ -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> /** diff --git a/src/libstrongswan/plugins/pgp/pgp_cert.c b/src/libstrongswan/plugins/pgp/pgp_cert.c index a99bed2f6..89d7094ad 100644 --- a/src/libstrongswan/plugins/pgp/pgp_cert.c +++ b/src/libstrongswan/plugins/pgp/pgp_cert.c @@ -18,7 +18,7 @@ #include <time.h> -#include <debug.h> +#include <utils/debug.h> typedef struct private_pgp_cert_t private_pgp_cert_t; diff --git a/src/libstrongswan/plugins/pgp/pgp_encoder.c b/src/libstrongswan/plugins/pgp/pgp_encoder.c index d16d1d71b..100f3ef33 100644 --- a/src/libstrongswan/plugins/pgp/pgp_encoder.c +++ b/src/libstrongswan/plugins/pgp/pgp_encoder.c @@ -15,7 +15,7 @@ #include "pgp_encoder.h" -#include <debug.h> +#include <utils/debug.h> /** * Build a PGPv3 fingerprint diff --git a/src/libstrongswan/plugins/pgp/pgp_utils.c b/src/libstrongswan/plugins/pgp/pgp_utils.c index 7fd905ce4..bb15627fd 100644 --- a/src/libstrongswan/plugins/pgp/pgp_utils.c +++ b/src/libstrongswan/plugins/pgp/pgp_utils.c @@ -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", diff --git a/src/libstrongswan/plugins/pkcs1/pkcs1_builder.c b/src/libstrongswan/plugins/pkcs1/pkcs1_builder.c index 6d022f362..c6661fcda 100644 --- a/src/libstrongswan/plugins/pkcs1/pkcs1_builder.c +++ b/src/libstrongswan/plugins/pkcs1/pkcs1_builder.c @@ -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> diff --git a/src/libstrongswan/plugins/pkcs1/pkcs1_encoder.c b/src/libstrongswan/plugins/pkcs1/pkcs1_encoder.c index 9122e8d8e..60f0ca757 100644 --- a/src/libstrongswan/plugins/pkcs1/pkcs1_encoder.c +++ b/src/libstrongswan/plugins/pkcs1/pkcs1_encoder.c @@ -15,7 +15,7 @@ #include "pkcs1_encoder.h" -#include <debug.h> +#include <utils/debug.h> #include <asn1/asn1.h> #include <asn1/oid.h> diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_creds.c b/src/libstrongswan/plugins/pkcs11/pkcs11_creds.c index ef936d4a1..e65f3a06b 100644 --- a/src/libstrongswan/plugins/pkcs11/pkcs11_creds.c +++ b/src/libstrongswan/plugins/pkcs11/pkcs11_creds.c @@ -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; diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_dh.c b/src/libstrongswan/plugins/pkcs11/pkcs11_dh.c index c870370c8..2e5af95ff 100644 --- a/src/libstrongswan/plugins/pkcs11/pkcs11_dh.c +++ b/src/libstrongswan/plugins/pkcs11/pkcs11_dh.c @@ -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> diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_hasher.c b/src/libstrongswan/plugins/pkcs11/pkcs11_hasher.c index 53a2bfca7..80079b9a9 100644 --- a/src/libstrongswan/plugins/pkcs11/pkcs11_hasher.c +++ b/src/libstrongswan/plugins/pkcs11/pkcs11_hasher.c @@ -17,7 +17,7 @@ #include <unistd.h> -#include <debug.h> +#include <utils/debug.h> #include <threading/mutex.h> #include "pkcs11_manager.h" diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_library.c b/src/libstrongswan/plugins/pkcs11/pkcs11_library.c index b7b2ada7d..7661473b1 100644 --- a/src/libstrongswan/plugins/pkcs11/pkcs11_library.c +++ b/src/libstrongswan/plugins/pkcs11/pkcs11_library.c @@ -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> diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_manager.c b/src/libstrongswan/plugins/pkcs11/pkcs11_manager.c index 52e46d322..8bda5b66f 100644 --- a/src/libstrongswan/plugins/pkcs11/pkcs11_manager.c +++ b/src/libstrongswan/plugins/pkcs11/pkcs11_manager.c @@ -15,7 +15,7 @@ #include "pkcs11_manager.h" -#include <debug.h> +#include <utils/debug.h> #include <collections/linked_list.h> #include <threading/thread.h> diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_plugin.c b/src/libstrongswan/plugins/pkcs11/pkcs11_plugin.c index 7760f3592..9afaf123a 100644 --- a/src/libstrongswan/plugins/pkcs11/pkcs11_plugin.c +++ b/src/libstrongswan/plugins/pkcs11/pkcs11_plugin.c @@ -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> diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_private_key.c b/src/libstrongswan/plugins/pkcs11/pkcs11_private_key.c index aa6e6e28b..bb9cc7a21 100644 --- a/src/libstrongswan/plugins/pkcs11/pkcs11_private_key.c +++ b/src/libstrongswan/plugins/pkcs11/pkcs11_private_key.c @@ -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; diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_public_key.c b/src/libstrongswan/plugins/pkcs11/pkcs11_public_key.c index a8bfb56e0..0302c0edd 100644 --- a/src/libstrongswan/plugins/pkcs11/pkcs11_public_key.c +++ b/src/libstrongswan/plugins/pkcs11/pkcs11_public_key.c @@ -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; diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_rng.c b/src/libstrongswan/plugins/pkcs11/pkcs11_rng.c index 20e4b6f76..d18028b45 100644 --- a/src/libstrongswan/plugins/pkcs11/pkcs11_rng.c +++ b/src/libstrongswan/plugins/pkcs11/pkcs11_rng.c @@ -15,7 +15,7 @@ #include "pkcs11_rng.h" -#include <debug.h> +#include <utils/debug.h> #include "pkcs11_manager.h" diff --git a/src/libstrongswan/plugins/pkcs8/pkcs8_builder.c b/src/libstrongswan/plugins/pkcs8/pkcs8_builder.c index a501423b1..26a3620d7 100644 --- a/src/libstrongswan/plugins/pkcs8/pkcs8_builder.c +++ b/src/libstrongswan/plugins/pkcs8/pkcs8_builder.c @@ -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> diff --git a/src/libstrongswan/plugins/plugin_feature.c b/src/libstrongswan/plugins/plugin_feature.c index 6e043878c..d39fa6eee 100644 --- a/src/libstrongswan/plugins/plugin_feature.c +++ b/src/libstrongswan/plugins/plugin_feature.c @@ -21,7 +21,7 @@ #include "plugin_feature.h" -#include <debug.h> +#include <utils/debug.h> ENUM(plugin_feature_names, FEATURE_NONE, FEATURE_CUSTOM, "NONE", diff --git a/src/libstrongswan/plugins/plugin_loader.c b/src/libstrongswan/plugins/plugin_loader.c index 10336950c..cea219e92 100644 --- a/src/libstrongswan/plugins/plugin_loader.c +++ b/src/libstrongswan/plugins/plugin_loader.c @@ -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> diff --git a/src/libstrongswan/plugins/pubkey/pubkey_cert.c b/src/libstrongswan/plugins/pubkey/pubkey_cert.c index 0304ccb36..95f53f919 100644 --- a/src/libstrongswan/plugins/pubkey/pubkey_cert.c +++ b/src/libstrongswan/plugins/pubkey/pubkey_cert.c @@ -17,7 +17,7 @@ #include <time.h> -#include <debug.h> +#include <utils/debug.h> typedef struct private_pubkey_cert_t private_pubkey_cert_t; diff --git a/src/libstrongswan/plugins/random/random_plugin.c b/src/libstrongswan/plugins/random/random_plugin.c index cef20047a..24c711a69 100644 --- a/src/libstrongswan/plugins/random/random_plugin.c +++ b/src/libstrongswan/plugins/random/random_plugin.c @@ -22,7 +22,7 @@ #include <errno.h> #include <library.h> -#include <debug.h> +#include <utils/debug.h> #include "random_rng.h" #ifndef DEV_RANDOM diff --git a/src/libstrongswan/plugins/random/random_rng.c b/src/libstrongswan/plugins/random/random_rng.c index 52cfc080e..568844899 100644 --- a/src/libstrongswan/plugins/random/random_rng.c +++ b/src/libstrongswan/plugins/random/random_rng.c @@ -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" diff --git a/src/libstrongswan/plugins/revocation/revocation_validator.c b/src/libstrongswan/plugins/revocation/revocation_validator.c index dc8e454e7..44c234559 100644 --- a/src/libstrongswan/plugins/revocation/revocation_validator.c +++ b/src/libstrongswan/plugins/revocation/revocation_validator.c @@ -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> diff --git a/src/libstrongswan/plugins/soup/soup_fetcher.c b/src/libstrongswan/plugins/soup/soup_fetcher.c index 3e5786b12..681a3c357 100644 --- a/src/libstrongswan/plugins/soup/soup_fetcher.c +++ b/src/libstrongswan/plugins/soup/soup_fetcher.c @@ -18,7 +18,7 @@ #include <libsoup/soup.h> #include <library.h> -#include <debug.h> +#include <utils/debug.h> #define DEFAULT_TIMEOUT 10 diff --git a/src/libstrongswan/plugins/sqlite/sqlite_database.c b/src/libstrongswan/plugins/sqlite/sqlite_database.c index 0fb3c7fff..e2352b285 100644 --- a/src/libstrongswan/plugins/sqlite/sqlite_database.c +++ b/src/libstrongswan/plugins/sqlite/sqlite_database.c @@ -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; diff --git a/src/libstrongswan/plugins/test_vectors/test_vectors/rng.c b/src/libstrongswan/plugins/test_vectors/test_vectors/rng.c index 18e0c9278..3316c364d 100644 --- a/src/libstrongswan/plugins/test_vectors/test_vectors/rng.c +++ b/src/libstrongswan/plugins/test_vectors/test_vectors/rng.c @@ -15,7 +15,7 @@ #include <crypto/crypto_tester.h> -#include <debug.h> +#include <utils/debug.h> /** * Monobit test diff --git a/src/libstrongswan/plugins/x509/x509_ac.c b/src/libstrongswan/plugins/x509/x509_ac.c index ddfb952c7..7d83e48ea 100644 --- a/src/libstrongswan/plugins/x509/x509_ac.c +++ b/src/libstrongswan/plugins/x509/x509_ac.c @@ -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> diff --git a/src/libstrongswan/plugins/x509/x509_cert.c b/src/libstrongswan/plugins/x509/x509_cert.c index 09480df7c..c93b83bef 100644 --- a/src/libstrongswan/plugins/x509/x509_cert.c +++ b/src/libstrongswan/plugins/x509/x509_cert.c @@ -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> diff --git a/src/libstrongswan/plugins/x509/x509_crl.c b/src/libstrongswan/plugins/x509/x509_crl.c index a3bc4efb0..5350d4a51 100644 --- a/src/libstrongswan/plugins/x509/x509_crl.c +++ b/src/libstrongswan/plugins/x509/x509_crl.c @@ -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> diff --git a/src/libstrongswan/plugins/x509/x509_ocsp_request.c b/src/libstrongswan/plugins/x509/x509_ocsp_request.c index 5f82118c8..09c5a8539 100644 --- a/src/libstrongswan/plugins/x509/x509_ocsp_request.c +++ b/src/libstrongswan/plugins/x509/x509_ocsp_request.c @@ -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> diff --git a/src/libstrongswan/plugins/x509/x509_ocsp_response.c b/src/libstrongswan/plugins/x509/x509_ocsp_response.c index 42994a291..1f8929958 100644 --- a/src/libstrongswan/plugins/x509/x509_ocsp_response.c +++ b/src/libstrongswan/plugins/x509/x509_ocsp_response.c @@ -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> diff --git a/src/libstrongswan/plugins/x509/x509_pkcs10.c b/src/libstrongswan/plugins/x509/x509_pkcs10.c index 2fa8d413d..024b4dba5 100644 --- a/src/libstrongswan/plugins/x509/x509_pkcs10.c +++ b/src/libstrongswan/plugins/x509/x509_pkcs10.c @@ -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> diff --git a/src/libstrongswan/plugins/xcbc/xcbc.c b/src/libstrongswan/plugins/xcbc/xcbc.c index 1bb7e640a..802c8a39f 100644 --- a/src/libstrongswan/plugins/xcbc/xcbc.c +++ b/src/libstrongswan/plugins/xcbc/xcbc.c @@ -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> diff --git a/src/libstrongswan/processing/processor.c b/src/libstrongswan/processing/processor.c index abeac76e3..934636fc0 100644 --- a/src/libstrongswan/processing/processor.c +++ b/src/libstrongswan/processing/processor.c @@ -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> diff --git a/src/libstrongswan/processing/scheduler.c b/src/libstrongswan/processing/scheduler.c index c97dbc4be..3f1598fc4 100644 --- a/src/libstrongswan/processing/scheduler.c +++ b/src/libstrongswan/processing/scheduler.c @@ -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> diff --git a/src/libstrongswan/selectors/traffic_selector.c b/src/libstrongswan/selectors/traffic_selector.c index f0caad139..87e57095c 100644 --- a/src/libstrongswan/selectors/traffic_selector.c +++ b/src/libstrongswan/selectors/traffic_selector.c @@ -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 diff --git a/src/libstrongswan/settings.c b/src/libstrongswan/settings.c index 9bdb74434..712ea6ee2 100644 --- a/src/libstrongswan/settings.c +++ b/src/libstrongswan/settings.c @@ -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 diff --git a/src/libstrongswan/threading/mutex.c b/src/libstrongswan/threading/mutex.c index df0cd27bf..f86e781c5 100644 --- a/src/libstrongswan/threading/mutex.c +++ b/src/libstrongswan/threading/mutex.c @@ -21,7 +21,7 @@ #include <errno.h> #include <library.h> -#include <debug.h> +#include <utils/debug.h> #include "condvar.h" #include "mutex.h" diff --git a/src/libstrongswan/threading/rwlock.c b/src/libstrongswan/threading/rwlock.c index 9ce9c6a71..176445705 100644 --- a/src/libstrongswan/threading/rwlock.c +++ b/src/libstrongswan/threading/rwlock.c @@ -18,7 +18,7 @@ #include <pthread.h> #include <library.h> -#include <debug.h> +#include <utils/debug.h> #include "rwlock.h" #include "rwlock_condvar.h" diff --git a/src/libstrongswan/threading/spinlock.c b/src/libstrongswan/threading/spinlock.c index 812cf696b..f0602f0b0 100644 --- a/src/libstrongswan/threading/spinlock.c +++ b/src/libstrongswan/threading/spinlock.c @@ -17,7 +17,7 @@ #include <pthread.h> #include <library.h> -#include <debug.h> +#include <utils/debug.h> #include "spinlock.h" #include "mutex.h" diff --git a/src/libstrongswan/threading/thread.c b/src/libstrongswan/threading/thread.c index 33b09304b..e524409c7 100644 --- a/src/libstrongswan/threading/thread.c +++ b/src/libstrongswan/threading/thread.c @@ -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> diff --git a/src/libstrongswan/utils.c b/src/libstrongswan/utils.c index 4e13a4c51..bf0224c5f 100644 --- a/src/libstrongswan/utils.c +++ b/src/libstrongswan/utils.c @@ -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", diff --git a/src/libstrongswan/utils/capabilities.c b/src/libstrongswan/utils/capabilities.c index 34128d010..c36a76efe 100644 --- a/src/libstrongswan/utils/capabilities.c +++ b/src/libstrongswan/utils/capabilities.c @@ -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> diff --git a/src/libstrongswan/debug.c b/src/libstrongswan/utils/debug.c index e8c9e6b98..e8c9e6b98 100644 --- a/src/libstrongswan/debug.c +++ b/src/libstrongswan/utils/debug.c diff --git a/src/libstrongswan/debug.h b/src/libstrongswan/utils/debug.h index 337dfd92f..c46d3fe55 100644 --- a/src/libstrongswan/debug.h +++ b/src/libstrongswan/utils/debug.h @@ -15,7 +15,7 @@ /** * @defgroup debug debug - * @{ @ingroup libstrongswan + * @{ @ingroup utils */ #ifndef DEBUG_H_ diff --git a/src/libstrongswan/utils/leak_detective.c b/src/libstrongswan/utils/leak_detective.c index 723f33098..2b0be1661 100644 --- a/src/libstrongswan/utils/leak_detective.c +++ b/src/libstrongswan/utils/leak_detective.c @@ -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> diff --git a/src/libstrongswan/utils/optionsfrom.c b/src/libstrongswan/utils/optionsfrom.c index 5fd4cfd4d..a550c1aa3 100644 --- a/src/libstrongswan/utils/optionsfrom.c +++ b/src/libstrongswan/utils/optionsfrom.c @@ -17,7 +17,7 @@ #include <errno.h> #include <library.h> -#include <debug.h> +#include <utils/debug.h> #include <utils/lexparser.h> #include "optionsfrom.h" diff --git a/src/libtls/tls.c b/src/libtls/tls.c index 2bcaffbc8..dea08e3eb 100644 --- a/src/libtls/tls.c +++ b/src/libtls/tls.c @@ -15,7 +15,7 @@ #include "tls.h" -#include <debug.h> +#include <utils/debug.h> #include "tls_protection.h" #include "tls_compression.h" diff --git a/src/libtls/tls_alert.c b/src/libtls/tls_alert.c index 6647129ba..7dd219db8 100644 --- a/src/libtls/tls_alert.c +++ b/src/libtls/tls_alert.c @@ -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, diff --git a/src/libtls/tls_cache.c b/src/libtls/tls_cache.c index 1bcc966d5..c13b1e851 100644 --- a/src/libtls/tls_cache.c +++ b/src/libtls/tls_cache.c @@ -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> diff --git a/src/libtls/tls_crypto.c b/src/libtls/tls_crypto.c index f74984879..20a7da023 100644 --- a/src/libtls/tls_crypto.c +++ b/src/libtls/tls_crypto.c @@ -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, diff --git a/src/libtls/tls_eap.c b/src/libtls/tls_eap.c index 928aadcb3..68cebb994 100644 --- a/src/libtls/tls_eap.c +++ b/src/libtls/tls_eap.c @@ -18,7 +18,7 @@ #include "tls.h" -#include <debug.h> +#include <utils/debug.h> #include <library.h> /** diff --git a/src/libtls/tls_fragmentation.c b/src/libtls/tls_fragmentation.c index f2fa77cfd..c76376b43 100644 --- a/src/libtls/tls_fragmentation.c +++ b/src/libtls/tls_fragmentation.c @@ -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 diff --git a/src/libtls/tls_peer.c b/src/libtls/tls_peer.c index 65072d087..e9f967e84 100644 --- a/src/libtls/tls_peer.c +++ b/src/libtls/tls_peer.c @@ -15,7 +15,7 @@ #include "tls_peer.h" -#include <debug.h> +#include <utils/debug.h> #include <credentials/certificates/x509.h> #include <time.h> diff --git a/src/libtls/tls_protection.c b/src/libtls/tls_protection.c index 8263728bb..0d5df18f7 100644 --- a/src/libtls/tls_protection.c +++ b/src/libtls/tls_protection.c @@ -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; diff --git a/src/libtls/tls_server.c b/src/libtls/tls_server.c index a66448d24..ec42b67fc 100644 --- a/src/libtls/tls_server.c +++ b/src/libtls/tls_server.c @@ -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; diff --git a/src/libtls/tls_socket.c b/src/libtls/tls_socket.c index 3abff596d..75b714e30 100644 --- a/src/libtls/tls_socket.c +++ b/src/libtls/tls_socket.c @@ -18,7 +18,7 @@ #include <unistd.h> #include <errno.h> -#include <debug.h> +#include <utils/debug.h> #include <threading/thread.h> /** diff --git a/src/libtnccs/tnc/tnc.c b/src/libtnccs/tnc/tnc.c index 7c0ee4132..feded3b2c 100644 --- a/src/libtnccs/tnc/tnc.c +++ b/src/libtnccs/tnc/tnc.c @@ -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; diff --git a/src/libtnccs/tnc/tnccs/tnccs_manager.c b/src/libtnccs/tnc/tnccs/tnccs_manager.c index fa91bfb21..fca4b2584 100644 --- a/src/libtnccs/tnc/tnccs/tnccs_manager.c +++ b/src/libtnccs/tnc/tnccs/tnccs_manager.c @@ -17,7 +17,7 @@ #include "tnc/tnc.h" -#include <debug.h> +#include <utils/debug.h> /** * See header diff --git a/src/manager/main.c b/src/manager/main.c index 5c297cf0c..15ed38154 100644 --- a/src/manager/main.c +++ b/src/manager/main.c @@ -14,7 +14,7 @@ */ #include <dispatcher.h> -#include <debug.h> +#include <utils/debug.h> #include <stdio.h> #include "manager.h" diff --git a/src/medsrv/controller/peer_controller.c b/src/medsrv/controller/peer_controller.c index edcf653b2..7b0b9e6ac 100644 --- a/src/medsrv/controller/peer_controller.c +++ b/src/medsrv/controller/peer_controller.c @@ -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> diff --git a/src/medsrv/filter/auth_filter.c b/src/medsrv/filter/auth_filter.c index d21abdc46..436a72f2b 100644 --- a/src/medsrv/filter/auth_filter.c +++ b/src/medsrv/filter/auth_filter.c @@ -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; diff --git a/src/medsrv/main.c b/src/medsrv/main.c index 1f43a7e17..03b135289 100644 --- a/src/medsrv/main.c +++ b/src/medsrv/main.c @@ -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" diff --git a/src/openac/openac.c b/src/openac/openac.c index 745988750..7b81d6cea 100644 --- a/src/openac/openac.c +++ b/src/openac/openac.c @@ -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> diff --git a/src/pki/command.c b/src/pki/command.c index 43328575c..a5e5b8528 100644 --- a/src/pki/command.c +++ b/src/pki/command.c @@ -23,7 +23,7 @@ #include <stdio.h> #include <library.h> -#include <debug.h> +#include <utils/debug.h> #include <utils/optionsfrom.h> /** diff --git a/src/pki/commands/issue.c b/src/pki/commands/issue.c index 34df6c2c7..5f098ba41 100644 --- a/src/pki/commands/issue.c +++ b/src/pki/commands/issue.c @@ -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> diff --git a/src/pki/commands/signcrl.c b/src/pki/commands/signcrl.c index dc53022f2..f9746cca7 100644 --- a/src/pki/commands/signcrl.c +++ b/src/pki/commands/signcrl.c @@ -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> diff --git a/src/pki/pki.c b/src/pki/pki.c index e28bf1595..3f77c5e8d 100644 --- a/src/pki/pki.c +++ b/src/pki/pki.c @@ -18,7 +18,7 @@ #include <unistd.h> -#include <debug.h> +#include <utils/debug.h> #include <credentials/sets/callback_cred.h> /** diff --git a/src/scepclient/scep.c b/src/scepclient/scep.c index 8b2fd179a..855af3965 100644 --- a/src/scepclient/scep.c +++ b/src/scepclient/scep.c @@ -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> diff --git a/src/scepclient/scepclient.c b/src/scepclient/scepclient.c index 2638ec84d..f57afca28 100644 --- a/src/scepclient/scepclient.c +++ b/src/scepclient/scepclient.c @@ -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> diff --git a/src/starter/args.c b/src/starter/args.c index 2416960bd..1c16e0b9c 100644 --- a/src/starter/args.c +++ b/src/starter/args.c @@ -18,7 +18,7 @@ #include <string.h> #include <library.h> -#include <debug.h> +#include <utils/debug.h> #include "keywords.h" #include "confread.h" diff --git a/src/starter/confread.c b/src/starter/confread.c index 6544b1ccd..6e3ac17d9 100644 --- a/src/starter/confread.c +++ b/src/starter/confread.c @@ -22,7 +22,7 @@ #include <netdb.h> #include <library.h> -#include <debug.h> +#include <utils/debug.h> #include "keywords.h" #include "confread.h" diff --git a/src/starter/invokecharon.c b/src/starter/invokecharon.c index 102d1589e..1c93381f7 100644 --- a/src/starter/invokecharon.c +++ b/src/starter/invokecharon.c @@ -24,7 +24,7 @@ #include <errno.h> #include <library.h> -#include <debug.h> +#include <utils/debug.h> #include "confread.h" #include "invokecharon.h" diff --git a/src/starter/klips.c b/src/starter/klips.c index 484b7e281..22165465f 100644 --- a/src/starter/klips.c +++ b/src/starter/klips.c @@ -17,7 +17,7 @@ #include <stdlib.h> #include <library.h> -#include <debug.h> +#include <utils/debug.h> #include "files.h" diff --git a/src/starter/netkey.c b/src/starter/netkey.c index 25f68e505..921a220db 100644 --- a/src/starter/netkey.c +++ b/src/starter/netkey.c @@ -18,7 +18,7 @@ #include <library.h> #include <hydra.h> -#include <debug.h> +#include <utils/debug.h> #include "files.h" diff --git a/src/starter/parser.y b/src/starter/parser.y index 424e3a9fd..2cf0501f4 100644 --- a/src/starter/parser.y +++ b/src/starter/parser.y @@ -18,7 +18,7 @@ #include <string.h> #include <library.h> -#include <debug.h> +#include <utils/debug.h> #include "ipsec-parser.h" diff --git a/src/starter/starter.c b/src/starter/starter.c index 85197cd8b..727a0d60c 100644 --- a/src/starter/starter.c +++ b/src/starter/starter.c @@ -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" diff --git a/src/starter/starterstroke.c b/src/starter/starterstroke.c index 9cff78c7d..68e6fd5ea 100644 --- a/src/starter/starterstroke.c +++ b/src/starter/starterstroke.c @@ -27,7 +27,7 @@ #include <credentials/auth_cfg.h> #include <library.h> -#include <debug.h> +#include <utils/debug.h> #include <stroke_msg.h> |