]> git.ipfire.org Git - thirdparty/strongswan.git/commitdiff
libhydra: Remove empty unused library
authorTobias Brunner <tobias@strongswan.org>
Fri, 12 Feb 2016 15:35:54 +0000 (16:35 +0100)
committerTobias Brunner <tobias@strongswan.org>
Thu, 3 Mar 2016 16:36:11 +0000 (17:36 +0100)
125 files changed:
Android.mk
configure.ac
packages/maemo-strongswan/debian/strongswan.install
packages/strongswan/debian/libstrongswan.install
src/Makefile.am
src/charon-cmd/Makefile.am
src/charon-cmd/charon-cmd.c
src/charon-nm/Makefile.am
src/charon-nm/charon-nm.c
src/charon-svc/Makefile.am
src/charon-svc/charon-svc.c
src/charon-systemd/Makefile.am
src/charon-systemd/charon-systemd.c
src/charon-tkm/Makefile.am
src/charon-tkm/src/charon-tkm.c
src/charon-tkm/tests/tests.c
src/charon/Android.mk
src/charon/Makefile.am
src/charon/charon.c
src/checksum/Makefile.am
src/checksum/checksum_builder.c
src/conftest/Makefile.am
src/conftest/conftest.c
src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
src/frontends/android/app/src/main/jni/Android.mk
src/frontends/android/app/src/main/jni/libandroidbridge/Android.mk
src/frontends/android/app/src/main/jni/libandroidbridge/android_jni.c
src/frontends/android/app/src/main/jni/libandroidbridge/charonservice.c
src/frontends/osx/charon-xpc/charon-xpc.c
src/frontends/osx/strongSwan.xcodeproj/project.pbxproj
src/libcharon/Android.mk
src/libcharon/Makefile.am
src/libcharon/plugins/addrblock/Makefile.am
src/libcharon/plugins/android_dns/Makefile.am
src/libcharon/plugins/android_log/Makefile.am
src/libcharon/plugins/attr/Makefile.am
src/libcharon/plugins/attr_sql/Makefile.am
src/libcharon/plugins/certexpire/Makefile.am
src/libcharon/plugins/connmark/Makefile.am
src/libcharon/plugins/coupling/Makefile.am
src/libcharon/plugins/dhcp/Makefile.am
src/libcharon/plugins/dnscert/Makefile.am
src/libcharon/plugins/duplicheck/Makefile.am
src/libcharon/plugins/eap_aka/Makefile.am
src/libcharon/plugins/eap_aka_3gpp2/Makefile.am
src/libcharon/plugins/eap_dynamic/Makefile.am
src/libcharon/plugins/eap_gtc/Makefile.am
src/libcharon/plugins/eap_identity/Makefile.am
src/libcharon/plugins/eap_md5/Makefile.am
src/libcharon/plugins/eap_mschapv2/Makefile.am
src/libcharon/plugins/eap_peap/Makefile.am
src/libcharon/plugins/eap_radius/Makefile.am
src/libcharon/plugins/eap_sim/Makefile.am
src/libcharon/plugins/eap_sim_file/Makefile.am
src/libcharon/plugins/eap_sim_pcsc/Makefile.am
src/libcharon/plugins/eap_simaka_pseudonym/Makefile.am
src/libcharon/plugins/eap_simaka_reauth/Makefile.am
src/libcharon/plugins/eap_simaka_sql/Makefile.am
src/libcharon/plugins/eap_tls/Makefile.am
src/libcharon/plugins/eap_tnc/Makefile.am
src/libcharon/plugins/eap_ttls/Makefile.am
src/libcharon/plugins/error_notify/Makefile.am
src/libcharon/plugins/ext_auth/Makefile.am
src/libcharon/plugins/farp/Makefile.am
src/libcharon/plugins/forecast/Makefile.am
src/libcharon/plugins/ha/Makefile.am
src/libcharon/plugins/ipseckey/Makefile.am
src/libcharon/plugins/kernel_iph/Makefile.am
src/libcharon/plugins/kernel_libipsec/Makefile.am
src/libcharon/plugins/kernel_wfp/Makefile.am
src/libcharon/plugins/led/Makefile.am
src/libcharon/plugins/load_tester/Makefile.am
src/libcharon/plugins/lookip/Makefile.am
src/libcharon/plugins/maemo/Makefile.am
src/libcharon/plugins/medcli/Makefile.am
src/libcharon/plugins/medsrv/Makefile.am
src/libcharon/plugins/osx_attr/Makefile.am
src/libcharon/plugins/radattr/Makefile.am
src/libcharon/plugins/resolve/Makefile.am
src/libcharon/plugins/smp/Makefile.am
src/libcharon/plugins/socket_default/Makefile.am
src/libcharon/plugins/socket_dynamic/Makefile.am
src/libcharon/plugins/socket_win/Makefile.am
src/libcharon/plugins/sql/Makefile.am
src/libcharon/plugins/stroke/Makefile.am
src/libcharon/plugins/systime_fix/Makefile.am
src/libcharon/plugins/tnc_ifmap/Makefile.am
src/libcharon/plugins/tnc_pdp/Makefile.am
src/libcharon/plugins/uci/Makefile.am
src/libcharon/plugins/unity/Makefile.am
src/libcharon/plugins/updown/Makefile.am
src/libcharon/plugins/vici/Makefile.am
src/libcharon/plugins/whitelist/Makefile.am
src/libcharon/plugins/xauth_eap/Makefile.am
src/libcharon/plugins/xauth_generic/Makefile.am
src/libcharon/plugins/xauth_noauth/Makefile.am
src/libcharon/plugins/xauth_pam/Makefile.am
src/libcharon/tests/Makefile.am
src/libcharon/tests/libcharon_tests.c
src/libhydra/Android.mk [deleted file]
src/libhydra/Makefile.am [deleted file]
src/libhydra/hydra.c [deleted file]
src/libhydra/hydra.h [deleted file]
src/libhydra/tests/.gitignore [deleted file]
src/libhydra/tests/Makefile.am [deleted file]
src/libhydra/tests/hydra_tests.c [deleted file]
src/libhydra/tests/hydra_tests.h [deleted file]
src/libsimaka/Makefile.am
src/libstrongswan/utils/compat/windows.c
src/pool/Makefile.am
src/scepclient/Makefile.am
src/starter/Android.mk
src/starter/Makefile.am
src/starter/starter.c
testing/tests/ikev1/ip-pool-db/hosts/moon/etc/strongswan.conf
testing/tests/ikev2/ip-pool-db/hosts/moon/etc/strongswan.conf
testing/tests/ikev2/ip-split-pools-db/hosts/moon/etc/strongswan.conf
testing/tests/ikev2/ip-two-pools-db/hosts/moon/etc/strongswan.conf
testing/tests/ikev2/ip-two-pools-mixed/hosts/moon/etc/strongswan.conf
testing/tests/ikev2/ip-two-pools-v4v6-db/hosts/moon/etc/strongswan.conf
testing/tests/sql/ip-pool-db-expired/hosts/moon/etc/strongswan.conf
testing/tests/sql/ip-pool-db-restart/hosts/moon/etc/strongswan.conf
testing/tests/sql/ip-pool-db/hosts/moon/etc/strongswan.conf
testing/tests/sql/ip-split-pools-db-restart/hosts/moon/etc/strongswan.conf
testing/tests/sql/ip-split-pools-db/hosts/moon/etc/strongswan.conf

index 7b8bc8f87d7bb29c5feda2eac6458f271e315788..f17289ea0502c1de87fa9b49cf9a9f1cc13004b8 100644 (file)
@@ -97,7 +97,6 @@ strongswan_CFLAGS += \
 strongswan_BUILD := \
        charon \
        libcharon \
-       libhydra \
        libstrongswan \
        libtncif \
        libtnccs \
index b1c91e2ca48ebfe0ebab01f62392d2ec988cdd72..5f2280840d19c5682ccd59d2e7571ce5a9076426 100644 (file)
@@ -1601,7 +1601,6 @@ AM_CONDITIONAL(USE_SCEPCLIENT, test x$scepclient = xtrue)
 AM_CONDITIONAL(USE_SCRIPTS, test x$scripts = xtrue)
 AM_CONDITIONAL(USE_CONFTEST, test x$conftest = xtrue)
 AM_CONDITIONAL(USE_LIBSTRONGSWAN, test x$charon = xtrue -o x$pki = xtrue -o x$scepclient = xtrue -o x$conftest = xtrue -o x$fast = xtrue -o x$imcv = xtrue -o x$nm = xtrue -o x$tkm = xtrue -o x$cmd = xtrue -o x$tls = xtrue -o x$tnc_tnccs = xtrue -o x$aikgen = xtrue -o x$svc = xtrue -o x$systemd = xtrue)
-AM_CONDITIONAL(USE_LIBHYDRA, test x$charon = xtrue -o x$nm = xtrue -o x$tkm = xtrue -o x$cmd = xtrue -o x$svc = xtrue -o x$systemd = xtrue)
 AM_CONDITIONAL(USE_LIBCHARON, test x$charon = xtrue -o x$conftest = xtrue -o x$nm = xtrue -o x$tkm = xtrue -o x$cmd = xtrue -o x$svc = xtrue -o x$systemd = xtrue)
 AM_CONDITIONAL(USE_LIBIPSEC, test x$libipsec = xtrue)
 AM_CONDITIONAL(USE_LIBTNCIF, test x$tnc_tnccs = xtrue -o x$imcv = xtrue)
@@ -1744,8 +1743,6 @@ AC_CONFIG_FILES([
        src/libstrongswan/plugins/bliss/tests/Makefile
        src/libstrongswan/plugins/test_vectors/Makefile
        src/libstrongswan/tests/Makefile
-       src/libhydra/Makefile
-       src/libhydra/tests/Makefile
        src/libipsec/Makefile
        src/libipsec/tests/Makefile
        src/libsimaka/Makefile
index 71b46e358df83a1fa5f95b947d1736799632b2e2..ff3d6271227eb8dfa3140cb2e19dd764f08fca42 100644 (file)
@@ -2,7 +2,6 @@
 etc
 # libraries
 usr/lib/ipsec/libstrongswan.so*
-usr/lib/ipsec/libhydra.so*
 usr/lib/ipsec/libcharon.so*
 # starter etc.
 usr/sbin/ipsec
index d384cf30fc4af94189b0932c6be5fb5e3f343933..1d3fe0c5d471b15dd81fc114ab81fc892628f7f2 100644 (file)
@@ -2,7 +2,6 @@ etc/strongswan.conf                                                                                             etc/
 usr/lib/strongswan/libstrongswan.so*                                                   usr/lib/strongswan/
 usr/lib/strongswan/libcharon.so*                                                               usr/lib/strongswan/
 usr/lib/strongswan/libtls.so*                                                                  usr/lib/strongswan/
-usr/lib/strongswan/libhydra.so*                                                                        usr/lib/strongswan/
 usr/lib/strongswan/plugins/libstrongswan-x509.so*                              usr/lib/strongswan/plugins/
 usr/lib/strongswan/plugins/libstrongswan-pubkey.so*                            usr/lib/strongswan/plugins/
 usr/lib/strongswan/plugins/libstrongswan-xcbc.so*                              usr/lib/strongswan/plugins/
index 9608a3a13a5af15387c9511444e557fb2a32cad4..a9df10cc6a3def0c0d92a5a06bde6bbc2a0a95a9 100644 (file)
@@ -4,10 +4,6 @@ if USE_LIBSTRONGSWAN
   SUBDIRS += libstrongswan
 endif
 
-if USE_LIBHYDRA
-  SUBDIRS += libhydra
-endif
-
 if USE_LIBIPSEC
   SUBDIRS += libipsec
 endif
index 73df450721c540e92212348838cdbd3753f1e6ea..1f4033aad4474e2ce37f623ab7e85736f8ece241 100644 (file)
@@ -12,7 +12,6 @@ charon-cmd.o :        $(top_builddir)/config.status
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -DIPSEC_DIR=\"${ipsecdir}\" \
        -DIPSEC_PIDDIR=\"${piddir}\" \
@@ -20,6 +19,5 @@ AM_CPPFLAGS = \
 
 charon_cmd_LDADD = \
        $(top_builddir)/src/libstrongswan/libstrongswan.la \
-       $(top_builddir)/src/libhydra/libhydra.la \
        $(top_builddir)/src/libcharon/libcharon.la \
        -lm $(PTHREADLIB) $(DLLIB)
index d3b31cc0d47d00611204df19d328c8f0e149bba4..f350198c66fe2521a97f61807eaa829417370824 100644 (file)
@@ -26,7 +26,6 @@
 #include <errno.h>
 
 #include <library.h>
-#include <hydra.h>
 #include <daemon.h>
 #include <utils/backtrace.h>
 #include <threading/thread.h>
@@ -330,11 +329,6 @@ int main(int argc, char *argv[])
                        exit(SS_RC_DAEMON_INTEGRITY);
                }
        }
-       atexit(libhydra_deinit);
-       if (!libhydra_init())
-       {
-               exit(SS_RC_INITIALIZATION_FAILED);
-       }
        atexit(libcharon_deinit);
        if (!libcharon_init())
        {
index d3630ffd5a1f79dad9b7f1b1bf63a03014e6576b..b6f0c8b54937ea723fc34b20f604c230ff8d5976 100644 (file)
@@ -9,7 +9,6 @@ charon_nm_SOURCES = \
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -DIPSEC_DIR=\"${ipsecdir}\" \
        -DIPSEC_PIDDIR=\"${piddir}\" \
@@ -21,6 +20,5 @@ AM_CFLAGS = \
 
 charon_nm_LDADD = \
        $(top_builddir)/src/libstrongswan/libstrongswan.la \
-       $(top_builddir)/src/libhydra/libhydra.la \
        $(top_builddir)/src/libcharon/libcharon.la \
        -lm $(PTHREADLIB) $(DLLIB) ${nm_LIBS}
index fb090e5d3e253f62d32e26b1b35b728ef987676b..cbbed7ac13bbcbdce56b75195acda47321f4b3f9 100644 (file)
@@ -20,7 +20,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include <hydra.h>
 #include <daemon.h>
 
 #include <library.h>
@@ -177,14 +176,6 @@ int main(int argc, char *argv[])
                exit(SS_RC_DAEMON_INTEGRITY);
        }
 
-       if (!libhydra_init())
-       {
-               dbg_syslog(DBG_DMN, 1, "initialization failed - aborting charon-nm");
-               libhydra_deinit();
-               library_deinit();
-               exit(SS_RC_INITIALIZATION_FAILED);
-       }
-
        if (!libcharon_init())
        {
                dbg_syslog(DBG_DMN, 1, "initialization failed - aborting charon-nm");
@@ -212,7 +203,6 @@ int main(int argc, char *argv[])
        {
                DBG1(DBG_DMN, "integrity tests enabled:");
                DBG1(DBG_DMN, "lib    'libstrongswan': passed file and segment integrity tests");
-               DBG1(DBG_DMN, "lib    'libhydra': passed file and segment integrity tests");
                DBG1(DBG_DMN, "lib    'libcharon': passed file and segment integrity tests");
                DBG1(DBG_DMN, "daemon 'charon-nm': passed file integrity test");
        }
@@ -260,7 +250,6 @@ int main(int argc, char *argv[])
 
 deinit:
        libcharon_deinit();
-       libhydra_deinit();
        library_deinit();
        return status;
 }
index ecccf02f5f01a03b58233a628f13e7285b7eca5a..c91ad08f8cfe2e5625a52c369e835fadc5f628a6 100644 (file)
@@ -6,11 +6,9 @@ charon-svc.o : $(top_builddir)/config.status
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -DPLUGINS=\""${charon_plugins}\""
 
 charon_svc_LDADD = \
        $(top_builddir)/src/libstrongswan/libstrongswan.la \
-       $(top_builddir)/src/libhydra/libhydra.la \
        $(top_builddir)/src/libcharon/libcharon.la
index 03cbdb871d83271947adc5cbc9cd26955e2c458b..522cd127e6d54a337e2600b3d8ed36baa5dc42fe 100644 (file)
@@ -14,7 +14,6 @@
  */
 
 #include <library.h>
-#include <hydra.h>
 #include <daemon.h>
 
 #include <utils/backtrace.h>
@@ -210,28 +209,22 @@ static void init_and_run(DWORD dwArgc, LPTSTR *lpszArgv, int (*wait)())
                if (library_init(NULL, SERVICE_NAME))
                {
                        update_status(SERVICE_START_PENDING);
-                       if (libhydra_init())
+                       if (libcharon_init())
                        {
+                               charon->load_loggers(charon, levels, TRUE);
+                               print_version();
                                update_status(SERVICE_START_PENDING);
-                               if (libcharon_init())
+                               if (charon->initialize(charon, PLUGINS))
                                {
-                                       charon->load_loggers(charon, levels, TRUE);
-                                       print_version();
                                        update_status(SERVICE_START_PENDING);
-                                       if (charon->initialize(charon, PLUGINS))
-                                       {
-                                               update_status(SERVICE_START_PENDING);
-                                               lib->plugins->status(lib->plugins, LEVEL_CTRL);
+                                       lib->plugins->status(lib->plugins, LEVEL_CTRL);
 
-                                               charon->start(charon);
+                                       charon->start(charon);
 
-                                               status.dwWin32ExitCode = wait();
-                                       }
-                                       update_status(SERVICE_STOP_PENDING);
-                                       libcharon_deinit();
+                                       status.dwWin32ExitCode = wait();
                                }
                                update_status(SERVICE_STOP_PENDING);
-                               libhydra_deinit();
+                               libcharon_deinit();
                        }
                        update_status(SERVICE_STOP_PENDING);
                        library_deinit();
index ee85d43d18434e96ddd963438fac722de0fd2d4f..9942a36827ae868e3259d92c52a0ca293fbaf6f9 100644 (file)
@@ -7,13 +7,11 @@ charon-systemd.o :    $(top_builddir)/config.status
 
 charon_systemd_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        $(systemd_CFLAGS) $(systemd_daemon_CFLAGS) $(systemd_journal_CFLAGS) \
        -DPLUGINS=\""${charon_plugins}\""
 
 charon_systemd_LDADD = \
        $(top_builddir)/src/libstrongswan/libstrongswan.la \
-       $(top_builddir)/src/libhydra/libhydra.la \
        $(top_builddir)/src/libcharon/libcharon.la \
        $(systemd_LIBS) $(systemd_daemon_LIBS) $(systemd_journal_LIBS) -lm $(PTHREADLIB) $(DLLIB)
index 4286cde8211d8745230545643235c51d847d2da1..a83db5ac4f88aafd3785f1811a4f31f489d76784 100644 (file)
@@ -31,7 +31,6 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-journal.h>
 
-#include <hydra.h>
 #include <daemon.h>
 
 #include <library.h>
@@ -355,12 +354,6 @@ int main(int argc, char *argv[])
                sd_notifyf(0, "STATUS=integrity check of charon-systemd failed");
                return SS_RC_INITIALIZATION_FAILED;
        }
-       atexit(libhydra_deinit);
-       if (!libhydra_init())
-       {
-               sd_notifyf(0, "STATUS=libhydra initialization failed");
-               return SS_RC_INITIALIZATION_FAILED;
-       }
        atexit(libcharon_deinit);
        if (!libcharon_init())
        {
index d2b81a3eaed8811639b3f353789464a6793b7a10..ad54eafc0e2256b920b8a4270a0367ee5691554a 100644 (file)
@@ -4,15 +4,13 @@ OBJ = $(abs_top_builddir)/src
 AM_CPPFLAGS = \
        -include $(abs_top_builddir)/config.h \
        -I$(SRC)/libstrongswan \
-       -I$(SRC)/libhydra \
        -I$(SRC)/libcharon
 
 LIBLD = \
        -L$(OBJ)/libstrongswan/.libs \
-       -L$(OBJ)/libhydra/.libs \
        -L$(OBJ)/libcharon/.libs
-LIBPT = $(OBJ)/libstrongswan/.libs:$(OBJ)/libhydra/.libs:$(OBJ)/libcharon/.libs
-LIBFL = -lstrongswan -lhydra -lcharon
+LIBPT = $(OBJ)/libstrongswan/.libs:$(OBJ)/libcharon/.libs
+LIBFL = -lstrongswan -lcharon
 
 DEFS += -DPLUGINS=\""$(PLUGINS)\"" -DIPSEC_PIDDIR=\"${piddir}\"
 
index 3923c8ae61505bdf1fdc02e7c5780683027dd5cc..13352e55aa7927c197ac7501fbf66b96cc6187f6 100644 (file)
@@ -26,7 +26,6 @@
 #include <libgen.h>
 #include <errno.h>
 
-#include <hydra.h>
 #include <daemon.h>
 #include <library.h>
 #include <utils/backtrace.h>
@@ -256,14 +255,6 @@ int main(int argc, char *argv[])
                exit(status);
        }
 
-       if (!libhydra_init())
-       {
-               dbg_syslog(DBG_DMN, 1, "initialization failed - aborting %s", dmn_name);
-               libhydra_deinit();
-               library_deinit();
-               exit(status);
-       }
-
        if (!libcharon_init())
        {
                dbg_syslog(DBG_DMN, 1, "initialization failed - aborting %s", dmn_name);
@@ -391,7 +382,6 @@ int main(int argc, char *argv[])
 deinit:
        destroy_dh_mapping();
        libcharon_deinit();
-       libhydra_deinit();
        library_deinit();
        tkm_deinit();
        return status;
index ac152b6907e0c57cb4d1e2f212a0572cf3357dfb..e3cd2d9036ed7020e9c4ba31648e40fe5593e3ea 100644 (file)
@@ -18,7 +18,6 @@
 #include <tests/test_runner.h>
 
 #include <library.h>
-#include <hydra.h>
 #include <daemon.h>
 
 #include "tkm.h"
@@ -50,7 +49,6 @@ static bool test_runner_init(bool init)
 
        if (init)
        {
-               libhydra_init();
                libcharon_init();
                lib->settings->set_int(lib->settings,
                                                           "test-runner.filelog.stdout.default", 0);
@@ -74,8 +72,6 @@ static bool test_runner_init(bool init)
 
                plugin_loader_add_plugindirs(BUILDDIR "/src/libstrongswan/plugins",
                                                                         PLUGINS);
-               plugin_loader_add_plugindirs(BUILDDIR "/src/libhydra/plugins",
-                                                                        PLUGINS);
                plugin_loader_add_plugindirs(BUILDDIR "/src/libcharon/plugins",
                                                                         PLUGINS);
                if (charon->initialize(charon, PLUGINS))
@@ -95,7 +91,6 @@ static bool test_runner_init(bool init)
 
        destroy_dh_mapping();
        libcharon_deinit();
-       libhydra_deinit();
        return result;
 }
 
index 852d73c10936461b44a8a001f547a38b6363d5bc..92a027094a59ab13ff97985a198f05c849461fdd 100644 (file)
@@ -8,7 +8,6 @@ charon.c
 # build charon -----------------------------------------------------------------
 
 LOCAL_C_INCLUDES += \
-       $(strongswan_PATH)/src/libhydra \
        $(strongswan_PATH)/src/libcharon \
        $(strongswan_PATH)/src/libstrongswan
 
@@ -23,7 +22,7 @@ LOCAL_ARM_MODE := arm
 
 LOCAL_PRELINK_MODULE := false
 
-LOCAL_SHARED_LIBRARIES += libstrongswan libhydra libcharon
+LOCAL_SHARED_LIBRARIES += libstrongswan libcharon
 
 include $(BUILD_EXECUTABLE)
 
index 6c5b88eb86a75ea50b7db5c9551cb33d382f9702..c6a6f40f93dbb3106180d758d64d3ca5fd4b95c3 100644 (file)
@@ -7,7 +7,6 @@ charon.o :      $(top_builddir)/config.status
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -DIPSEC_DIR=\"${ipsecdir}\" \
        -DIPSEC_PIDDIR=\"${piddir}\" \
@@ -15,7 +14,6 @@ AM_CPPFLAGS = \
 
 charon_LDADD = \
        $(top_builddir)/src/libstrongswan/libstrongswan.la \
-       $(top_builddir)/src/libhydra/libhydra.la \
        $(top_builddir)/src/libcharon/libcharon.la \
        -lm $(PTHREADLIB) $(DLLIB)
 
index 4c2a9a4779e972fad1d00c7ae4a9b075a16d76b8..116ce7e9387714ce5c76a4e94d8a938fd62fa5b7 100644 (file)
@@ -27,7 +27,6 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include <hydra.h>
 #include <daemon.h>
 
 #include <library.h>
@@ -309,14 +308,6 @@ int main(int argc, char *argv[])
                exit(SS_RC_DAEMON_INTEGRITY);
        }
 
-       if (!libhydra_init())
-       {
-               dbg_stderr(DBG_DMN, 1, "initialization failed - aborting charon");
-               libhydra_deinit();
-               library_deinit();
-               exit(SS_RC_INITIALIZATION_FAILED);
-       }
-
        if (!libcharon_init())
        {
                dbg_stderr(DBG_DMN, 1, "initialization failed - aborting charon");
@@ -403,7 +394,6 @@ int main(int argc, char *argv[])
        {
                DBG1(DBG_DMN, "integrity tests enabled:");
                DBG1(DBG_DMN, "lib    'libstrongswan': passed file and segment integrity tests");
-               DBG1(DBG_DMN, "lib    'libhydra': passed file and segment integrity tests");
                DBG1(DBG_DMN, "lib    'libcharon': passed file and segment integrity tests");
                DBG1(DBG_DMN, "daemon 'charon': passed file integrity test");
        }
@@ -457,7 +447,6 @@ int main(int argc, char *argv[])
 
 deinit:
        libcharon_deinit();
-       libhydra_deinit();
        library_deinit();
        return status;
 }
index b358699d0cbc7e2186b6889a5ebf42ef678ad748..9cc5fb6b21dc39e51760b9667635f7ea0313579f 100644 (file)
@@ -8,7 +8,6 @@ EXTRA_PROGRAMS = checksum_builder
 checksum_builder_SOURCES = checksum_builder.c
 checksum_builder_LDADD = \
        $(top_builddir)/src/libstrongswan/libstrongswan.la \
-       $(top_builddir)/src/libhydra/libhydra.la \
        $(top_builddir)/src/libcharon/libcharon.la \
        $(DLLIB)
 checksum_builder_LDFLAGS = -rpath '$(DESTDIR)$(ipseclibdir)'
@@ -17,7 +16,6 @@ CLEANFILES = checksum.c $(EXTRA_PROGRAMS)
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -DPLUGINDIR=\"${DESTDIR}${plugindir}\"
 
@@ -35,14 +33,6 @@ if !MONOLITHIC
   AM_CPPFLAGS += -DS_PLUGINS=\""${s_plugins}\""
 endif
 
-if USE_LIBHYDRA
-  deps += $(top_builddir)/src/libhydra/libhydra.la
-  libs += $(DESTDIR)$(ipseclibdir)/libhydra.so
-if !MONOLITHIC
-  AM_CPPFLAGS += -DH_PLUGINS=\""${h_plugins}\""
-endif
-endif
-
 if USE_LIBIPSEC
   deps += $(top_builddir)/src/libipsec/libipsec.la
   libs += $(DESTDIR)$(ipseclibdir)/libipsec.so
index cc8185ecdfa35063343b487c7344af8f49b91860..65399f5bcdce5f07881df7e52c96b9c7d523eb68 100644 (file)
@@ -19,7 +19,6 @@
 #include <dlfcn.h>
 
 #include <library.h>
-#include <hydra.h>
 #include <daemon.h>
 #include <collections/enumerator.h>
 
@@ -128,9 +127,8 @@ int main(int argc, char* argv[])
 {
        int i;
 
-       /* forces link against libhydra/libcharon, imports symbols needed to
+       /* forces link against libcharon, imports symbols needed to
         * dlopen plugins */
-       hydra = NULL;
        charon = NULL;
 
        /* avoid confusing leak reports in build process */
@@ -159,9 +157,6 @@ int main(int argc, char* argv[])
 #ifdef S_PLUGINS
        build_plugin_checksums(S_PLUGINS);
 #endif
-#ifdef H_PLUGINS
-       build_plugin_checksums(H_PLUGINS);
-#endif
 #ifdef T_PLUGINS
        build_plugin_checksums(T_PLUGINS);
 #endif
index eeb26f2252ef6bc6a3339dbee79bde4f5b04bf3e..2d4e439dae21ded3376a380ea0b963c8f9296c3c 100644 (file)
@@ -2,7 +2,6 @@ ipsec_PROGRAMS = conftest
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -DPLUGINS=\""${charon_plugins}\""
 
@@ -20,7 +19,6 @@ conftest_SOURCES = conftest.c conftest.h config.c config.h actions.c actions.h \
 
 conftest_LDADD = \
        $(top_builddir)/src/libstrongswan/libstrongswan.la \
-       $(top_builddir)/src/libhydra/libhydra.la \
        $(top_builddir)/src/libcharon/libcharon.la \
        -lm $(PTHREADLIB) $(DLLIB)
 
index edfe0ca35685c436cbbe2fb4c9a7bdc7d5d23594..d10f3c7b7d1a6d0c66073f703e2666c36247f65d 100644 (file)
@@ -356,7 +356,6 @@ static void cleanup()
        free(conftest->suite_dir);
        free(conftest);
        libcharon_deinit();
-       libhydra_deinit();
        library_deinit();
 }
 
@@ -442,16 +441,9 @@ int main(int argc, char *argv[])
                library_deinit();
                return SS_RC_LIBSTRONGSWAN_INTEGRITY;
        }
-       if (!libhydra_init())
-       {
-               libhydra_deinit();
-               library_deinit();
-               return SS_RC_INITIALIZATION_FAILED;
-       }
        if (!libcharon_init())
        {
                libcharon_deinit();
-               libhydra_deinit();
                library_deinit();
                return SS_RC_INITIALIZATION_FAILED;
        }
index e5241d5a7ac88bfd3612faf7960bd7965cec8b4a..84c44c1237855deb2cb303ca6a82a7aada300497 100644 (file)
@@ -848,7 +848,6 @@ public class CharonVpnService extends VpnService implements Runnable
                                System.loadLibrary("imcv");
                        }
 
-                       System.loadLibrary("hydra");
                        System.loadLibrary("charon");
                        System.loadLibrary("ipsec");
                }
index d2c64808809dfc396602a99265f0804c2335e964..b295320f4d71efb08a0aa1ee39af54d01a3c974f 100644 (file)
@@ -71,7 +71,6 @@ strongswan_BUILD := \
        libandroidbridge \
        strongswan/src/libipsec \
        strongswan/src/libcharon \
-       strongswan/src/libhydra \
        strongswan/src/libstrongswan
 
 ifneq ($(strongswan_USE_BYOD),)
index c56b8d5f02cb363dbd819b66f82156df2f4a76e0..31eb27f969ec7ca18c4235aa70826c2c7d28492f 100644 (file)
@@ -25,7 +25,6 @@ endif
 
 LOCAL_C_INCLUDES += \
        $(strongswan_PATH)/src/libipsec \
-       $(strongswan_PATH)/src/libhydra \
        $(strongswan_PATH)/src/libcharon \
        $(strongswan_PATH)/src/libstrongswan
 
@@ -54,7 +53,7 @@ LOCAL_PRELINK_MODULE := false
 
 LOCAL_LDLIBS := -llog
 
-LOCAL_SHARED_LIBRARIES := libstrongswan libhydra libipsec libcharon
+LOCAL_SHARED_LIBRARIES := libstrongswan libipsec libcharon
 
 ifneq ($(strongswan_USE_BYOD),)
 LOCAL_SHARED_LIBRARIES += libimcv libtncif libtnccs
index a6412bdf75c580bdd4675b3b5831e30c2f13516d..eaba85d4ed7a7cbb96011184ad43ad234919f73d 100644 (file)
@@ -37,7 +37,6 @@ static struct {
        { "libtnccs.so", NULL },
        { "libimcv.so", NULL },
 #endif
-       { "libhydra.so", NULL },
        { "libcharon.so", NULL },
        { "libipsec.so", NULL },
 };
index 2655f7361cb20b223c39aa37854bc90bbd77d778..3bed6eb4d06caba06e53cf7f0be9afd7b5b3a386 100644 (file)
@@ -35,7 +35,6 @@
 #endif
 
 #include <daemon.h>
-#include <hydra.h>
 #include <ipsec.h>
 #include <library.h>
 #include <threading/thread.h>
@@ -606,17 +605,9 @@ JNI_METHOD(CharonVpnService, initializeCharon, jboolean,
        set_options(logfile);
        free(logfile);
 
-       if (!libhydra_init())
-       {
-               libhydra_deinit();
-               library_deinit();
-               return FALSE;
-       }
-
        if (!libipsec_init())
        {
                libipsec_deinit();
-               libhydra_deinit();
                library_deinit();
                return FALSE;
        }
@@ -625,7 +616,6 @@ JNI_METHOD(CharonVpnService, initializeCharon, jboolean,
        {
                libcharon_deinit();
                libipsec_deinit();
-               libhydra_deinit();
                library_deinit();
                return FALSE;
        }
@@ -657,7 +647,6 @@ JNI_METHOD(CharonVpnService, initializeCharon, jboolean,
                libcharon_deinit();
                charonservice_deinit(env);
                libipsec_deinit();
-               libhydra_deinit();
                library_deinit();
                return FALSE;
        }
@@ -687,7 +676,6 @@ JNI_METHOD(CharonVpnService, deinitializeCharon, void)
        libcharon_deinit();
        charonservice_deinit(env);
        libipsec_deinit();
-       libhydra_deinit();
        library_deinit();
 }
 
index 0d8f0f455339822cce8ee989d7004f4954b994fa..14ce2e2153341dd3710bcf559ea25968bd728278 100644 (file)
@@ -22,7 +22,6 @@
 #include <errno.h>
 
 #include <library.h>
-#include <hydra.h>
 #include <daemon.h>
 #include <threading/thread.h>
 #include <utils/backtrace.h>
@@ -170,11 +169,6 @@ int main(int argc, char *argv[])
                        exit(SS_RC_DAEMON_INTEGRITY);
                }
        }
-       atexit(libhydra_deinit);
-       if (!libhydra_init())
-       {
-               exit(SS_RC_INITIALIZATION_FAILED);
-       }
        atexit(libcharon_deinit);
        if (!libcharon_init())
        {
index e5f222834f07924e74205d12cacb04a09687b40c..90e23359817c62d1242e56344d7496f7002c4fb4 100644 (file)
                                        /usr/include,
                                        ../../libstrongswan,
                                        ../../libcharon,
-                                       ../../libhydra,
                                );
                                INFOPLIST_FILE = "charon-xpc/charon-xpc-Info.plist";
                                INSTALL_PATH = /;
                                        /usr/lib,
                                        ../../libstrongswan/.libs,
                                        ../../libcharon/.libs,
-                                       ../../libhydra/.libs,
                                );
                                MACOSX_DEPLOYMENT_TARGET = 10.7;
                                OTHER_CFLAGS = (
                                        "-force_load",
                                        ../../libipsec/.libs/libipsec.a,
                                        "-force_load",
-                                       ../../libhydra/.libs/libhydra.a,
-                                       "-force_load",
                                        ../../libcharon/.libs/libcharon.a,
                                        "-sectcreate",
                                        __TEXT,
                                        /usr/include,
                                        ../../libstrongswan,
                                        ../../libcharon,
-                                       ../../libhydra,
                                );
                                INFOPLIST_FILE = "charon-xpc/charon-xpc-Info.plist";
                                INSTALL_PATH = /;
                                        /usr/lib,
                                        ../../libstrongswan/.libs,
                                        ../../libcharon/.libs,
-                                       ../../libhydra/.libs,
                                );
                                MACOSX_DEPLOYMENT_TARGET = 10.7;
                                OTHER_CFLAGS = (
                                        "-force_load",
                                        ../../libipsec/.libs/libipsec.a,
                                        "-force_load",
-                                       ../../libhydra/.libs/libhydra.a,
-                                       "-force_load",
                                        ../../libcharon/.libs/libcharon.a,
                                        "-sectcreate",
                                        __TEXT,
index 79422866593c1f525106062fda68f2eb51e83085..844bbfd8e030fa9758aa92fe962d2ce3df58b702 100644 (file)
@@ -235,7 +235,6 @@ endif
 # build libcharon --------------------------------------------------------------
 
 LOCAL_C_INCLUDES += \
-       $(strongswan_PATH)/src/libhydra \
        $(strongswan_PATH)/src/libstrongswan
 
 LOCAL_CFLAGS := $(strongswan_CFLAGS)
@@ -248,6 +247,6 @@ LOCAL_ARM_MODE := arm
 
 LOCAL_PRELINK_MODULE := false
 
-LOCAL_SHARED_LIBRARIES += libstrongswan libhydra
+LOCAL_SHARED_LIBRARIES += libstrongswan
 
 include $(BUILD_SHARED_LIBRARY)
index 910f502695a483e86e13e70735dd6c900b56c19f..4de8faab9232bf1e5802e456bb560ee4b38a2bbc 100644 (file)
@@ -146,7 +146,6 @@ daemon.lo :         $(top_builddir)/config.status
 AM_CPPFLAGS = \
        -I${linux_headers} \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -DIPSEC_DIR=\"${ipsecdir}\" \
        -DIPSEC_PIDDIR=\"${piddir}\"
@@ -156,7 +155,6 @@ AM_LDFLAGS = \
 
 libcharon_la_LIBADD = \
   $(top_builddir)/src/libstrongswan/libstrongswan.la \
-  $(top_builddir)/src/libhydra/libhydra.la \
   -lm $(PTHREADLIB) $(DLLIB) $(SOCKLIB)
 
 if USE_WINDOWS
index 33ee60d866adba0f9e180b9378a95c44224f865e..ddb2706c8279eb915990982dea6040bd3230d55c 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index 1a0d6e6f2880afe2367696f8c0285d1fbba71cf2..e606a832c8b79d5f81528e0e15d3f159e53ba02e 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index 79c61b51e4aa7f4a0000f21260e8f5231a924f05..9f82f6e605207e26ccd61c26e671bd5e976a5a8e 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index 6bc7e77d8c4b82b6a254ec524c4b24e9671b5406..ecbb76d1acc4fb14e47df2cac6e46147f161b367 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index 366c902f7f7111c3a25adb05917f414a9e6c7fac..e65ef36a1fe8320845e45bd978914759fb22278d 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index b8c241dfbbcae8e47324bab4ef281914925fcb7e..d2d38efea0f1395c31a80fded482c3f9fcd667bc 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -DIPSEC_PIDDIR=\"${piddir}\"
 
index cc4d0ec8d584ec4c264b19681900ef9979231124..561efa0afd68ebbbb182a954e8892414ec016306 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index badc7b7b280352cce5dbeb61484557215e6ddc36..62695aabe9be620b064f88ad3271d879834bfc39 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index 3c09db016343386e6b3a0d78dc45775bc9727170..9ae68be355216fcf0d4b8e7b440164db031c9277 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index 1455625226cac0e61baee56aae6f55dc65af11f9..8181bfc9e04a55f639a14a1d1f990f2e9c9ebde1 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index 338a114fe97c2385fae0539caee54219fd09aeb2..32b850ccbf005fddba3dbf184a162bda29314df0 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -DIPSEC_PIDDIR=\"${piddir}\"
 
index 75e8eafb2528237c889e0e2ddbdb6975030d4f89..5d7ab84859ea5849baf8c8ef805ef7bdefff0f0f 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -I$(top_srcdir)/src/libsimaka
 
index ec145a39ebf41b3cae5cac3315bcc0c3c027ea5b..d68bfc4c45ab65234513b7e5758f36fb32452d91 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -I$(top_srcdir)/src/libsimaka
 
index 58b827a78149dd21ede0382771891c2dbe58cf40..fd08846a9ee9416748eea0fbe608a357bb20bc9a 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index c3a12ba3ed9e9b7d5881b1ef52159261ae14a152..a7d1f6275625e7ae861270979137ce254a9b3744 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index 6c5b43f001f3800c7011541864317423ddff1959..4c44962bd988ff1cf15c4f85f7a9fa1d9e489470 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS =  \
index 16aa1919b1dc478d90db734b89ad11d6177da25c..b27e8cc54d6de296daae0ea6bc771a206ed10ad2 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index 4276a082d7263fe3b8741b2e5c049143c9aebe46..ded9bbe3fa107a0ce2e7aa9d55b66c63a8634030 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index 8960b84bd2e5a2037eb1aa0302b5f7fae29b06fe..ef226169d4b0249dfe86bc5d15ec0d12e6dd7638 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -I$(top_srcdir)/src/libtls
 
index bc7a7765d64605ad6feff49e5990fb26f5958952..78cf99184e77c07227c18644fac6dbc64096bf0a 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -I$(top_srcdir)/src/libradius
 
index f68138579415827ef29b99dbbbf0e00bb0ed9690..8d93077e28105911603e32ffdec73437a9c4f160 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -I$(top_srcdir)/src/libsimaka
 
index c38e55e2c57ab23be9b535d9cdd1a7b9c1a6978f..5c5694c186326c03a51c98ffa8b0dbf6814a8f7c 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -I$(top_srcdir)/src/libsimaka \
        -DIPSEC_CONFDIR=\"${sysconfdir}\"
index 22922049dd94295339743c4f745a0012935704d1..5e235e7ea3f8a362266b01005dd23748b979d9d9 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -I$(top_srcdir)/src/libsimaka
 
index f40efbd6f9e2b84cf4d8193999b8254dc4f864d4..c0d7b914ca9502e5be6dcaf06192f261b13e2cdd 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -I$(top_srcdir)/src/libsimaka
 
index 0fb62222097b39c8109974ea8dd9b71bf6d85a3a..9e55bb18834fa644124b0b8b6cfa801d2fc5c6ed 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -I$(top_srcdir)/src/libsimaka
 
index b7d6fd43e09c441c5c45ef132bccb152b542dd1a..f4c478dba74c06baeafb8420f2945499a869510f 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -I$(top_srcdir)/src/libsimaka \
        -DIPSEC_CONFDIR=\"${sysconfdir}\"
index 825beb8411b279b552200aaabf2397f377b0554b..551ecb380d2ec70bed5ec5c035dfcc00c13cacd2 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -I$(top_srcdir)/src/libtls
 
index 6fc78bc9a984818cef47024dfa1fff1dbb05e6bf..186ae45e2441116da9e88120eb1991d1ab41b4ab 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -I$(top_srcdir)/src/libtls \
        -I$(top_srcdir)/src/libtncif \
index 3a7a8cda303c4bba7c4a3e03f957a2e00543fc73..3db20e3483c6677019e83e6db9329b4d53a27d7a 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -I$(top_srcdir)/src/libtls \
        -I$(top_srcdir)/src/libradius
index 1c64bd2cc4e150e392851e17bb9ab2ff2c3d31d4..766bb4c51c4566e77684fb63057f22ebe14788bd 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -DIPSEC_PIDDIR=\"${piddir}\"
 
index d51ea888152999972a49e2c81c68e5fec75e006c..7028819aad24a0eaa8ae713113f9d11d3aaa8c40 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index 0d862b0a9725031acce8a8a6480aa3143b468be1..6d96f3abb9c720b5670bbe76cdd30b571591a38e 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index ce573135d621364575915f7c391eafd05e339bce..77535294e342b8a4de4604e4052bfcf53cd9cdf7 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index 50d3423896e0d628941f96fb20a80ec7b784b1b6..d501834d7cdaccecb78a0e029ae1574309efd1b3 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -DIPSEC_PIDDIR=\"${piddir}\"
 
index aed63c122683bd602bb4905c4cbc7f450ceae3e8..b8933008cbe07d0129f50cf0f214ce9bdd4d0537 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index 56946ae1fdd6ce660d130bad62270c5e051cb344..707570195fb1b28a4260765bee0194c5d16e0a27 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index eca2b23257783c5ad56bd06d4089f8363ce1c2dd..4757280b4ebafd96d2a3a6eba4fe7731ae8c5ad3 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -I$(top_srcdir)/src/libipsec
 
index 85e5089a3d996317b8c671779f32cfb4d9b7d4b0..737a79b6c9f04a632bd6fcd49b699dc6ce5d5d9b 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index 18d6af3995322b7adcf5ea411ad09a8ebfdf70bb..9868f9efa34ccd3d486329e354d09f1ebb2bbf48 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index 31e1b5c6f77328250a4d22416ab3739f300e973b..af3adb25717bfb1b52b9b2ba4e05ec40c46dfbfe 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -DIPSEC_PIDDIR=\"${piddir}\"
 
index 223654ea97d7cacb5065fd85ca05723ee0c85766..623275b21848e6c717e5c262afbacfb023a1c7bf 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -DIPSEC_PIDDIR=\"${piddir}\"
 
index fe5c963fdffe61f66859bee65b1a0cc27140ba21..02c283f5b776cbcf6872ff6885af2a12b74ed3b0 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index cfa825980da632abb71ad66f7f9f059738a753e7..0408c89633914f5713d09e83a322e5877b0de337 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index f2122026018ef20be8bfe01f3c6096dbeaf6b385..1d1cb4465d7951162bf912af82d843e8f0f81514 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index aa1d462906d824406e650adacadcb2861b225635..908aa8806032b2b0f2b320b64f7423a06024dff7 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index 15d5a0a1f94c6be7ea3c4e4102bcc3fd6afff70a..74d9351f2b08d8b7d4f3b0ed76a9e4fb0a094256 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -I$(top_srcdir)/src/libradius
 
index 9cfc370c025aaf1ce6861af437cede11e416f4df..d3d4e73cf3233963f5821628f2ab65976d978516 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -DRESOLV_CONF=\"${resolv_conf}\"
 
index 3aa533e56a253f149105837691ca1dc620887a5e..252db32a6ee315f53727a8385960d7ee481e9e5b 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -DIPSEC_PIDDIR=\"${piddir}\"
 
index e524ffd187180f52ff65ff4a128977d5fb0278ef..7231703b302526cfdfe6698a74e1b3012333907b 100644 (file)
@@ -1,7 +1,6 @@
 AM_CPPFLAGS = \
        -I${linux_headers} \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index a1e21b98bc15ac3b87ed286293956c506a7a22c0..087ebb728cce40074eafee6a86f9c46fa19c14be 100644 (file)
@@ -1,7 +1,6 @@
 AM_CPPFLAGS = \
        -I${linux_headers} \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index f01178fccccb73fa3f114e34ba5ca601e9b10c73..293d9bc9faa7e7ebbb9d0a66342f4a9b71779de0 100644 (file)
@@ -1,7 +1,6 @@
 AM_CPPFLAGS = \
        -I${linux_headers} \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index c947db89244a2fabfb9aad9577bdbad63763eed1..44a3d5f4ac16a53a4c455e3753a07a26d017b7fd 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index b90688791d1b92acacab764b766fef0fbe069816..26edc3dcd7636bf077c2718eb43f1bea3020deb0 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -I$(top_srcdir)/src/stroke \
        -DIPSEC_CONFDIR=\"${sysconfdir}\" \
index 40a346440c1c2140cdee95d7854a182bcfc995a3..95a33230f4908479b9e009e02bf2bca0af3f8bed 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 if MONOLITHIC
index 90fbf46513664609129c64a8f429167502f6c280..dab98129d4c1da2f33045f2a26e22df8a242880b 100644 (file)
@@ -1,7 +1,6 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libtls \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index 3478c5b3000c4aec079089b2265fd4460663a7cf..fcda7d76fe86e60ac7b8301ee13ff7b7164e37f4 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -I$(top_srcdir)/src/libradius \
        -I$(top_srcdir)/src/libtncif \
index 134ced0e345785314b949a2feab913cb06735ec9..296c8db041c96253027b68d71cfb14d6a694c62b 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index 38923e068748a3ffbd09b54df20dd5cf1ff7029e..1244cb317a182f4ef1894c86f3cda72bd898c082 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index f03f4744c0c61fab7bca7e322bcfd9e9a746063a..f8738adeef54d117451d7d07410e6ca50dc0317e 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index 552128397666129582b5252251a1b3f9068b5132..ca9b4990621c674bcd6bbd429cb96b7970822790 100644 (file)
@@ -1,7 +1,6 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libstrongswan/plugins/pubkey \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -DIPSEC_PIDDIR=\"${piddir}\"
 
index 1fd01c888e3ba4c88af2b468fa65effc6317ffb2..7f6bfff14d9e1db079855e4dfb4f0cbb4c3e995f 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -DIPSEC_PIDDIR=\"${piddir}\"
 
index ea75c15815a493daef532177f9200f818e453c07..5c7228e854f4a82a9c81fa787d69f62aebf0ef2d 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index 1ecd9fd14787ca8006e8397490d016c5c8fb953a..282bfc4fedf500b0b7e596828e01e07f3ed55a43 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index 3902471fec6bde83e7a0dee2cf36c689e4cdff77..bb41f2169cd84b3e5d6c2b445bde3ffa1017b1d3 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index abf83ca750e8dc051281af55c9f77223740ef31a..cee8bf811f8108091388e595c5113e00102704a6 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = \
index 5fd8ca26d83f19c9c0319141adcc6b956cfc859e..0589269aa985db620c70c235b65a132cc2188319 100644 (file)
@@ -10,7 +10,6 @@ libcharon_tests_SOURCES = \
 
 libcharon_tests_CFLAGS = \
   -I$(top_srcdir)/src/libcharon \
-  -I$(top_srcdir)/src/libhydra \
   -I$(top_srcdir)/src/libstrongswan \
   -I$(top_srcdir)/src/libstrongswan/tests \
   -DPLUGINDIR=\""$(abs_top_builddir)/src/libstrongswan/plugins\"" \
@@ -20,6 +19,5 @@ libcharon_tests_CFLAGS = \
 libcharon_tests_LDFLAGS = @COVERAGE_LDFLAGS@
 libcharon_tests_LDADD = \
   $(top_builddir)/src/libcharon/libcharon.la \
-  $(top_builddir)/src/libhydra/libhydra.la \
   $(top_builddir)/src/libstrongswan/libstrongswan.la \
   $(top_builddir)/src/libstrongswan/tests/libtest.la
index ec96de7118389163f4dcde3d63bd5e8d1e99d546..4692c3094a76e792b19bc6676c2bdffb710549dd 100644 (file)
@@ -14,7 +14,6 @@
  */
 
 #include <test_runner.h>
-#include <hydra.h>
 #include <daemon.h>
 
 /* declare test suite constructors */
@@ -39,7 +38,6 @@ static bool test_runner_init(bool init)
        {
                char *plugins, *plugindir;
 
-               libhydra_init();
                libcharon_init();
 
                plugins = getenv("TESTS_PLUGINS") ?:
@@ -59,7 +57,6 @@ static bool test_runner_init(bool init)
                lib->processor->cancel(lib->processor);
                lib->plugins->unload(lib->plugins);
                libcharon_deinit();
-               libhydra_deinit();
        }
        return TRUE;
 }
diff --git a/src/libhydra/Android.mk b/src/libhydra/Android.mk
deleted file mode 100644 (file)
index 2e50800..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# copy-n-paste from Makefile.am
-libhydra_la_SOURCES := \
-hydra.c hydra.h
-
-LOCAL_SRC_FILES := $(filter %.c,$(libhydra_la_SOURCES))
-
-# adding the plugin source files
-
-# build libhydra ---------------------------------------------------------------
-
-LOCAL_C_INCLUDES += \
-       $(strongswan_PATH)/src/libstrongswan
-
-LOCAL_CFLAGS := $(strongswan_CFLAGS)
-
-LOCAL_MODULE := libhydra
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_ARM_MODE := arm
-
-LOCAL_PRELINK_MODULE := false
-
-LOCAL_SHARED_LIBRARIES += libstrongswan
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/src/libhydra/Makefile.am b/src/libhydra/Makefile.am
deleted file mode 100644 (file)
index 047f7ca..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-ipseclib_LTLIBRARIES = libhydra.la
-
-libhydra_la_SOURCES = \
-hydra.c hydra.h
-
-libhydra_la_LIBADD = \
-  $(top_builddir)/src/libstrongswan/libstrongswan.la
-
-if USE_WINDOWS
-  libhydra_la_LIBADD += -lws2_32
-endif
-
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/src/libstrongswan \
-       -DIPSEC_DIR=\"${ipsecdir}\" \
-       -DPLUGINDIR=\"${plugindir}\"
-
-AM_LDFLAGS = \
-  -no-undefined
-
-EXTRA_DIST = Android.mk
-
-# build optional plugins
-########################
-
-if MONOLITHIC
-SUBDIRS =
-else
-SUBDIRS = .
-endif
-
-if MONOLITHIC
-  SUBDIRS += .
-endif
-SUBDIRS += tests
diff --git a/src/libhydra/hydra.c b/src/libhydra/hydra.c
deleted file mode 100644 (file)
index 2f6ce45..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2010 Tobias Brunner
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#include "hydra.h"
-
-#include <utils/debug.h>
-
-typedef struct private_hydra_t private_hydra_t;
-
-/**
- * Private additions to hydra_t.
- */
-struct private_hydra_t {
-
-       /**
-        * Public members of hydra_t.
-        */
-       hydra_t public;
-
-       /**
-        * Integrity check failed?
-        */
-       bool integrity_failed;
-
-       /**
-        * Number of times we have been initialized
-        */
-       refcount_t ref;
-};
-
-/**
- * Single instance of hydra_t.
- */
-hydra_t *hydra = NULL;
-
-/**
- * Described in header.
- */
-void libhydra_deinit()
-{
-       private_hydra_t *this = (private_hydra_t*)hydra;
-
-       if (!this || !ref_put(&this->ref))
-       {       /* have more users */
-               return;
-       }
-
-       free(this);
-       hydra = NULL;
-}
-
-/**
- * Described in header.
- */
-bool libhydra_init()
-{
-       private_hydra_t *this;
-
-       if (hydra)
-       {       /* already initialized, increase refcount */
-               this = (private_hydra_t*)hydra;
-               ref_get(&this->ref);
-               return !this->integrity_failed;
-       }
-
-       INIT(this,
-               .ref = 1,
-       );
-       hydra = &this->public;
-
-       if (lib->integrity &&
-               !lib->integrity->check(lib->integrity, "libhydra", libhydra_init))
-       {
-               DBG1(DBG_LIB, "integrity check of libhydra failed");
-               this->integrity_failed = TRUE;
-       }
-       return !this->integrity_failed;
-}
diff --git a/src/libhydra/hydra.h b/src/libhydra/hydra.h
deleted file mode 100644 (file)
index df9c69d..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2010 Tobias Brunner
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-/**
- * @defgroup libhydra libhydra
- *
- * @defgroup hkernel kernel
- * @ingroup libhydra
- *
- * @defgroup hplugins plugins
- * @ingroup libhydra
- *
- * @addtogroup libhydra
- * @{
- */
-
-#ifndef HYDRA_H_
-#define HYDRA_H_
-
-typedef struct hydra_t hydra_t;
-
-#include <library.h>
-
-/**
- * IKE Daemon support object.
- */
-struct hydra_t {
-
-};
-
-/**
- * The single instance of hydra_t.
- *
- * Set between calls to libhydra_init() and libhydra_deinit() calls.
- */
-extern hydra_t *hydra;
-
-/**
- * Initialize libhydra.
- *
- * libhydra_init() may be called multiple times in a single process, but each
- * caller must call libhydra_deinit() for each call to libhydra_init().
- *
- * @return                             FALSE if integrity check failed
- */
-bool libhydra_init();
-
-/**
- * Deinitialize libhydra.
- */
-void libhydra_deinit();
-
-#endif /** HYDRA_H_ @}*/
diff --git a/src/libhydra/tests/.gitignore b/src/libhydra/tests/.gitignore
deleted file mode 100644 (file)
index 6870ba5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-hydra_tests
diff --git a/src/libhydra/tests/Makefile.am b/src/libhydra/tests/Makefile.am
deleted file mode 100644 (file)
index 5acd5c2..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-TESTS = hydra_tests
-
-check_PROGRAMS = $(TESTS)
-
-hydra_tests_SOURCES = \
-  hydra_tests.h hydra_tests.c
-
-hydra_tests_CFLAGS = \
-  -I$(top_srcdir)/src/libhydra \
-  -I$(top_srcdir)/src/libstrongswan \
-  -I$(top_srcdir)/src/libstrongswan/tests \
-  @COVERAGE_CFLAGS@
-
-hydra_tests_LDFLAGS = @COVERAGE_LDFLAGS@
-hydra_tests_LDADD = \
-  $(top_builddir)/src/libhydra/libhydra.la \
-  $(top_builddir)/src/libstrongswan/libstrongswan.la \
-  $(top_builddir)/src/libstrongswan/tests/libtest.la
diff --git a/src/libhydra/tests/hydra_tests.c b/src/libhydra/tests/hydra_tests.c
deleted file mode 100644 (file)
index 0d6387b..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2014 Tobias Brunner
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#include <test_runner.h>
-#include <hydra.h>
-
-/* declare test suite constructors */
-#define TEST_SUITE(x) test_suite_t* x();
-#define TEST_SUITE_DEPEND(x, ...) TEST_SUITE(x)
-#include "hydra_tests.h"
-#undef TEST_SUITE
-#undef TEST_SUITE_DEPEND
-
-static test_configuration_t tests[] = {
-#define TEST_SUITE(x) \
-       { .suite = x, },
-#define TEST_SUITE_DEPEND(x, type, ...) \
-       { .suite = x, .feature = PLUGIN_DEPENDS(type, __VA_ARGS__) },
-#include "hydra_tests.h"
-       { .suite = NULL, }
-};
-
-static bool test_runner_init(bool init)
-{
-       if (init)
-       {
-               libhydra_init();
-       }
-       else
-       {
-               lib->processor->set_threads(lib->processor, 0);
-               lib->processor->cancel(lib->processor);
-               libhydra_deinit();
-       }
-       return TRUE;
-}
-
-int main(int argc, char *argv[])
-{
-       return test_runner_run("libhydra", tests, test_runner_init);
-}
diff --git a/src/libhydra/tests/hydra_tests.h b/src/libhydra/tests/hydra_tests.h
deleted file mode 100644 (file)
index 6b213d0..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (C) 2014 Tobias Brunner
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
index 9997ece08a31940d6154ebb2ca15c6393871f4d5..dd31689c6b6a2a827b58529ce4042ee12eacf8a7 100644 (file)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon
 
 AM_LDFLAGS = \
index 1f22ffa028a9cd6eb248b75e5f9483c8af61de76..12ee5991692f1a8412446d77a768a4d20a28516a 100644 (file)
@@ -82,7 +82,6 @@ static void* dlsym_default(const char *name)
 {
        const char *dlls[] = {
                "libstrongswan-0.dll",
-               "libhydra-0.dll",
                "libcharon-0.dll",
                "libtnccs-0.dll",
                NULL /* .exe */
index 5ae624b8807c913b78da14d6301ab98833698f2b..1513bbff476bf7d9a6447bb9c739193f5573e727 100644 (file)
@@ -10,13 +10,11 @@ pool.o :    $(top_builddir)/config.status
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -DPLUGINS=\""${pool_plugins}\""
 
 pool_LDADD = \
        $(top_builddir)/src/libstrongswan/libstrongswan.la \
-       $(top_builddir)/src/libhydra/libhydra.la \
        $(top_builddir)/src/libcharon/libcharon.la
 
 endif USE_ATTR_SQL
index b3beb1b6815d06cdf102118a30ea426bcf805ccd..13116723bb2e2c21e8f7c7c1c2f905cf378dfc5d 100644 (file)
@@ -6,7 +6,6 @@ scepclient.o :  $(top_builddir)/config.status
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -DIPSEC_CONFDIR=\"${sysconfdir}\" \
        -DPLUGINS=\""${scepclient_plugins}\""
 
index 8c5d1a92fa599ffac55c695c0cad602d894fd2b4..e882cc7e20ab89493f8acd9d1dd049cd673f5ca5 100644 (file)
@@ -14,7 +14,6 @@ LOCAL_SRC_FILES := $(filter %.c,$(starter_SOURCES))
 # build starter ----------------------------------------------------------------
 
 LOCAL_C_INCLUDES += \
-       $(strongswan_PATH)/src/libhydra \
        $(strongswan_PATH)/src/libstrongswan \
        $(strongswan_PATH)/src/starter \
        $(strongswan_PATH)/src/stroke
@@ -33,7 +32,7 @@ LOCAL_PRELINK_MODULE := false
 
 LOCAL_REQUIRED_MODULES := stroke
 
-LOCAL_SHARED_LIBRARIES += libstrongswan libhydra
+LOCAL_SHARED_LIBRARIES += libstrongswan
 
 include $(BUILD_EXECUTABLE)
 
index 175486689d111f1b4557d7d055ba6eaac2ee828b..8341ca3ee9c1d42396a2fc70430d2430562c024e 100644 (file)
@@ -15,7 +15,6 @@ parser/parser.y parser/lexer.l parser/conf_parser.c parser/conf_parser.h
 AM_CPPFLAGS = \
        -I${linux_headers} \
        -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
        -I$(top_srcdir)/src/starter \
        -I$(top_srcdir)/src/stroke \
@@ -33,7 +32,6 @@ AM_YFLAGS = -v -d
 
 starter_LDADD = \
        $(top_builddir)/src/libstrongswan/libstrongswan.la \
-       $(top_builddir)/src/libhydra/libhydra.la \
        $(top_builddir)/src/libcharon/libcharon.la \
        libstarter.la \
        $(SOCKLIB) $(PTHREADLIB)
index ab1ebdd5df53cab81796c886dfdcd041bdd47835..45c28d3cc933dc62b5c619798f43ac6947aeb709 100644 (file)
@@ -33,7 +33,6 @@
 #include <pthread.h>
 
 #include <library.h>
-#include <hydra.h>
 #include <utils/backtrace.h>
 #include <threading/thread.h>
 #include <utils/debug.h>
@@ -427,9 +426,6 @@ int main (int argc, char **argv)
        library_init(NULL, "starter");
        atexit(library_deinit);
 
-       libhydra_init();
-       atexit(libhydra_deinit);
-
        /* parse command line */
        for (i = 1; i < argc; i++)
        {
index 6c22fd548aa960641349581708038fdfb03075ef..b179f4369d0be48e19aecfce60cb5cb2e3c56f89 100644 (file)
@@ -4,7 +4,7 @@ charon {
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac xcbc stroke kernel-netlink socket-default sqlite attr-sql updown
 }
 
-libhydra {
+libstrongswan {
   plugins {
     attr-sql {
       database = sqlite:///etc/db.d/ipsec.db
index 6c22fd548aa960641349581708038fdfb03075ef..b179f4369d0be48e19aecfce60cb5cb2e3c56f89 100644 (file)
@@ -4,7 +4,7 @@ charon {
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac xcbc stroke kernel-netlink socket-default sqlite attr-sql updown
 }
 
-libhydra {
+libstrongswan {
   plugins {
     attr-sql {
       database = sqlite:///etc/db.d/ipsec.db
index 6c22fd548aa960641349581708038fdfb03075ef..b179f4369d0be48e19aecfce60cb5cb2e3c56f89 100644 (file)
@@ -4,7 +4,7 @@ charon {
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac xcbc stroke kernel-netlink socket-default sqlite attr-sql updown
 }
 
-libhydra {
+libstrongswan {
   plugins {
     attr-sql {
       database = sqlite:///etc/db.d/ipsec.db
index cf3b0d81bda1fc8a32208902f617101821d00e2a..d037d75fb1b1c0ca1d51137e72291ed733937593 100644 (file)
@@ -4,7 +4,7 @@ charon {
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac xcbc stroke sqlite attr-sql kernel-netlink socket-default updown
 }
 
-libhydra {
+libstrongswan {
   plugins {
     attr-sql {
       database = sqlite:///etc/db.d/ipsec.db
index cf3b0d81bda1fc8a32208902f617101821d00e2a..d037d75fb1b1c0ca1d51137e72291ed733937593 100644 (file)
@@ -4,7 +4,7 @@ charon {
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac xcbc stroke sqlite attr-sql kernel-netlink socket-default updown
 }
 
-libhydra {
+libstrongswan {
   plugins {
     attr-sql {
       database = sqlite:///etc/db.d/ipsec.db
index 5176e2a4dd79a585516532bf9aad51a0a8f303c7..66944c3aee57db634a17a07ddd57667be4813174 100644 (file)
@@ -4,7 +4,7 @@ charon {
   load = aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac stroke kernel-netlink socket-default updown sqlite attr-sql
 }
 
-libhydra {
+libstrongswan {
   plugins {
     attr-sql {
       database = sqlite:///etc/db.d/ipsec.db
index 2204af1cd1b572bb80f5ad604c3eac4819aafef5..0956ff042ac134a70789a07e3e1fb51e06f0c722 100644 (file)
@@ -9,7 +9,7 @@ charon {
   load = random nonce aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown sqlite sql attr-sql
 }
 
-libhydra {
+libstrongswan {
   plugins {
     attr-sql {
       database = sqlite:///etc/db.d/ipsec.db
index 2204af1cd1b572bb80f5ad604c3eac4819aafef5..0956ff042ac134a70789a07e3e1fb51e06f0c722 100644 (file)
@@ -9,7 +9,7 @@ charon {
   load = random nonce aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown sqlite sql attr-sql
 }
 
-libhydra {
+libstrongswan {
   plugins {
     attr-sql {
       database = sqlite:///etc/db.d/ipsec.db
index 2204af1cd1b572bb80f5ad604c3eac4819aafef5..0956ff042ac134a70789a07e3e1fb51e06f0c722 100644 (file)
@@ -9,7 +9,7 @@ charon {
   load = random nonce aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown sqlite sql attr-sql
 }
 
-libhydra {
+libstrongswan {
   plugins {
     attr-sql {
       database = sqlite:///etc/db.d/ipsec.db
index 2204af1cd1b572bb80f5ad604c3eac4819aafef5..0956ff042ac134a70789a07e3e1fb51e06f0c722 100644 (file)
@@ -9,7 +9,7 @@ charon {
   load = random nonce aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown sqlite sql attr-sql
 }
 
-libhydra {
+libstrongswan {
   plugins {
     attr-sql {
       database = sqlite:///etc/db.d/ipsec.db
index 2204af1cd1b572bb80f5ad604c3eac4819aafef5..0956ff042ac134a70789a07e3e1fb51e06f0c722 100644 (file)
@@ -9,7 +9,7 @@ charon {
   load = random nonce aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown sqlite sql attr-sql
 }
 
-libhydra {
+libstrongswan {
   plugins {
     attr-sql {
       database = sqlite:///etc/db.d/ipsec.db