Moved integrity_checker_t to utils folder

diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 2fa9dabd1b12e33b7cb832981e13e10530567489..3e549afb7910263c7953852b9afbbb568d9a9185 100644 (file)
--- 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 557a7a07ef3c9bf3c3dded88133051c8f8e77dd1..ad31c1b04e97172dfa14d30f41d67313774f4fe0 100644 (file)
--- 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 007ef6a9e43e56b70464bf7d05ad2d2ede464228..10336950c77c95b2f5dd99b7a2b6f127c580a0a0 100644 (file)
--- 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
similarity index 100%
rename from src/libstrongswan/integrity_checker.c
rename to src/libstrongswan/utils/integrity_checker.c

diff --git a/src/libstrongswan/integrity_checker.h b/src/libstrongswan/utils/integrity_checker.h
similarity index 98%
rename from src/libstrongswan/integrity_checker.h
rename to src/libstrongswan/utils/integrity_checker.h
index 891ccccf79f47711a439e8373e6a94fc7087f554..f999b9a2924d3728a1379e96011a9e767cfcca96 100644 (file)
--- 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;