Moved debug.[ch] to utils folder

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
 

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
 

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"

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"

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;
 

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

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>

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,

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",

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>

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>

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"
 

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;
 

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>

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;

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>

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>

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",

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>
 

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>

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

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>

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

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;
 

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

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>

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>

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"
 

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>

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>
 
 

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;
 

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;
 

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;
 

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>
 

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>

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>

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>

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

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>

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>

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"
 

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>

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;

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;
 

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>
 

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;
 

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;
 

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>

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>

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"

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>
 

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>

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>

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>

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>
 

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;

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>

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>
 
 /**

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;
 

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

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",

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>

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>
 

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;

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>

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"

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>
 

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>
 

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>

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;
 

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;
 

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"
 

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>

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",

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>

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;
 

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

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"

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>

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
 

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;

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

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>

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>

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>

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>
 

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>

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>

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>

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>

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>

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
 

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
 

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"

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"

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"

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>

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",

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>