diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-10-16 15:39:26 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-10-24 16:00:50 +0200 |
| commit | 08944b68ac960cca63855f68f25b6759a7985cac (patch) | |
| tree | 0daaadc8a5431625132b9640365640c79ef67ce9 | |
| parent | 12642a68314a400ee2ed8b0c4474287957696ef0 (diff) | |
| download | strongswan-08944b68ac960cca63855f68f25b6759a7985cac.tar.bz2 strongswan-08944b68ac960cca63855f68f25b6759a7985cac.tar.xz | |
Moved integrity_checker_t to utils folder
| -rw-r--r-- | src/libstrongswan/Makefile.am | 4 | ||||
| -rw-r--r-- | src/libstrongswan/library.h | 2 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/plugin_loader.c | 2 | ||||
| -rw-r--r-- | src/libstrongswan/utils/integrity_checker.c (renamed from src/libstrongswan/integrity_checker.c) | 0 | ||||
| -rw-r--r-- | src/libstrongswan/utils/integrity_checker.h (renamed from src/libstrongswan/integrity_checker.h) | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am index 2fa9dabd1..3e549afb7 100644 --- a/src/libstrongswan/Makefile.am +++ b/src/libstrongswan/Makefile.am @@ -70,7 +70,7 @@ 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/identification.h utils/lexparser.h \ utils/optionsfrom.h utils/capabilities.h utils/backtrace.h \ -utils/leak_detective.h integrity_checker.h +utils/leak_detective.h utils/integrity_checker.h endif library.lo : $(top_builddir)/config.status @@ -95,7 +95,7 @@ endif if USE_INTEGRITY_TEST AM_CFLAGS += -DINTEGRITY_TEST - libstrongswan_la_SOURCES += integrity_checker.c + libstrongswan_la_SOURCES += utils/integrity_checker.c endif if USE_VSTR diff --git a/src/libstrongswan/library.h b/src/libstrongswan/library.h index 557a7a07e..ad31c1b04 100644 --- a/src/libstrongswan/library.h +++ b/src/libstrongswan/library.h @@ -84,7 +84,6 @@ #include "utils.h" #include "chunk.h" #include "settings.h" -#include "integrity_checker.h" #include "networking/host_resolver.h" #include "processing/processor.h" #include "processing/scheduler.h" @@ -95,6 +94,7 @@ #include "credentials/credential_factory.h" #include "credentials/credential_manager.h" #include "credentials/cred_encoding.h" +#include "utils/integrity_checker.h" #include "utils/leak_detective.h" #include "plugins/plugin_loader.h" diff --git a/src/libstrongswan/plugins/plugin_loader.c b/src/libstrongswan/plugins/plugin_loader.c index 007ef6a9e..10336950c 100644 --- a/src/libstrongswan/plugins/plugin_loader.c +++ b/src/libstrongswan/plugins/plugin_loader.c @@ -24,10 +24,10 @@ #include <debug.h> #include <library.h> -#include <integrity_checker.h> #include <collections/hashtable.h> #include <collections/linked_list.h> #include <plugins/plugin.h> +#include <utils/integrity_checker.h> typedef struct private_plugin_loader_t private_plugin_loader_t; typedef struct plugin_entry_t plugin_entry_t; diff --git a/src/libstrongswan/integrity_checker.c b/src/libstrongswan/utils/integrity_checker.c index e962aba70..e962aba70 100644 --- a/src/libstrongswan/integrity_checker.c +++ b/src/libstrongswan/utils/integrity_checker.c diff --git a/src/libstrongswan/integrity_checker.h b/src/libstrongswan/utils/integrity_checker.h index 891ccccf7..f999b9a29 100644 --- a/src/libstrongswan/integrity_checker.h +++ b/src/libstrongswan/utils/integrity_checker.h @@ -15,13 +15,13 @@ /** * @defgroup integrity_checker integrity_checker - * @{ @ingroup libstrongswan + * @{ @ingroup utils */ #ifndef INTEGRITY_CHECKER_H_ #define INTEGRITY_CHECKER_H_ -#include "utils.h" +#include "../utils.h" typedef struct integrity_checker_t integrity_checker_t; typedef struct integrity_checksum_t integrity_checksum_t; |