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 7b8bc8f..f17289e 100644 (file)
@@ -97,7 +97,6 @@ strongswan_CFLAGS += \
 strongswan_BUILD := \
        charon \
        libcharon \
-       libhydra \
        libstrongswan \
        libtncif \
        libtnccs \
index b1c91e2..5f22808 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 71b46e3..ff3d627 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 d384cf3..1d3fe0c 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 9608a3a..a9df10c 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 73df450..1f4033a 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 d3b31cc..f350198 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 d3630ff..b6f0c8b 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 fb090e5..cbbed7a 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 ecccf02..c91ad08 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 03cbdb8..522cd12 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 ee85d43..9942a36 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 4286cde..a83db5a 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 d2b81a3..ad54eaf 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 3923c8a..13352e5 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 ac152b6..e3cd2d9 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 852d73c..92a0270 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 6c5b88e..c6a6f40 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 4c2a9a4..116ce7e 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 b358699..9cc5fb6 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 cc8185e..65399f5 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 eeb26f2..2d4e439 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 edfe0ca..d10f3c7 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 e5241d5..84c44c1 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 d2c6480..b295320 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 c56b8d5..31eb27f 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 a6412bd..eaba85d 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 2655f73..3bed6eb 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 0d8f0f4..14ce2e2 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 e5f2228..90e2335 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 7942286..844bbfd 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 910f502..4de8faa 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 33ee60d..ddb2706 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 1a0d6e6..e606a83 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 79c61b5..9f82f6e 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 6bc7e77..ecbb76d 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 366c902..e65ef36 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 b8c241d..d2d38ef 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 cc4d0ec..561efa0 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 badc7b7..62695aa 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 3c09db0..9ae68be 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 1455625..8181bfc 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 338a114..32b850c 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 75e8eaf..5d7ab84 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 ec145a3..d68bfc4 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 58b827a..fd08846 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 c3a12ba..a7d1f62 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 6c5b43f..4c44962 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 16aa191..b27e8cc 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 4276a08..ded9bbe 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 8960b84..ef22616 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 bc7a776..78cf991 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 f681385..8d93077 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 c38e55e..5c5694c 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 2292204..5e235e7 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 f40efbd..c0d7b91 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 0fb6222..9e55bb1 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 b7d6fd4..f4c478d 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 825beb8..551ecb3 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 6fc78bc..186ae45 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 3a7a8cd..3db20e3 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 1c64bd2..766bb4c 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 d51ea88..7028819 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 0d862b0..6d96f3a 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 ce57313..7753529 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 50d3423..d501834 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 aed63c1..b893300 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 56946ae..7075701 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 eca2b23..4757280 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 85e5089..737a79b 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 18d6af3..9868f9e 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 31e1b5c..af3adb2 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 223654e..623275b 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 fe5c963..02c283f 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 cfa8259..0408c89 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 f212202..1d1cb44 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 aa1d462..908aa88 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 15d5a0a..74d9351 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 9cfc370..d3d4e73 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 3aa533e..252db32 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 e524ffd..7231703 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 a1e21b9..087ebb7 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 f01178f..293d9bc 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 c947db8..44a3d5f 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 b906887..26edc3d 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 40a3464..95a3323 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 90fbf46..dab9812 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 3478c5b..fcda7d7 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 134ced0..296c8db 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 38923e0..1244cb3 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 f03f474..f8738ad 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 5521283..ca9b499 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 1fd01c8..7f6bfff 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 ea75c15..5c7228e 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 1ecd9fd..282bfc4 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 3902471..bb41f21 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 abf83ca..cee8bf8 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 5fd8ca2..0589269 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 ec96de7..4692c30 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 9997ece..dd31689 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 1f22ffa..12ee599 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 5ae624b..1513bbf 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 b3beb1b..1311672 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 8c5d1a9..e882cc7 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 1754866..8341ca3 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 ab1ebdd..45c28d3 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 6c22fd5..b179f43 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 6c22fd5..b179f43 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 6c22fd5..b179f43 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 cf3b0d8..d037d75 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 cf3b0d8..d037d75 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 5176e2a..66944c3 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 2204af1..0956ff0 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 2204af1..0956ff0 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 2204af1..0956ff0 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 2204af1..0956ff0 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 2204af1..0956ff0 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