denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libhydra: Remove empty unused library

Browse Source
This commit is contained in:
Tobias Brunner
2016-03-03 17:36:11 +01:00
parent 8394ea2a42
commit 28649f6d91
125 changed files with 26 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Android.mk
-1
View File
@@ -97,7 +97,6 @@ strongswan_CFLAGS += \
strongswan_BUILD := \ strongswan_BUILD := \
charon \ charon \
libcharon \ libcharon \
libhydra \
libstrongswan \ libstrongswan \
libtncif \ libtncif \
libtnccs \ libtnccs \
configure.ac
-3
View File
@@ -1601,7 +1601,6 @@ AM_CONDITIONAL(USE_SCEPCLIENT, test x$scepclient = xtrue)
AM_CONDITIONAL(USE_SCRIPTS, test x$scripts = xtrue) AM_CONDITIONAL(USE_SCRIPTS, test x$scripts = xtrue)
AM_CONDITIONAL(USE_CONFTEST, test x$conftest = 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_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_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_LIBIPSEC, test x$libipsec = xtrue)
AM_CONDITIONAL(USE_LIBTNCIF, test x$tnc_tnccs = xtrue -o x$imcv = 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/bliss/tests/Makefile
src/libstrongswan/plugins/test_vectors/Makefile src/libstrongswan/plugins/test_vectors/Makefile
src/libstrongswan/tests/Makefile src/libstrongswan/tests/Makefile
src/libhydra/Makefile
src/libhydra/tests/Makefile
src/libipsec/Makefile src/libipsec/Makefile
src/libipsec/tests/Makefile src/libipsec/tests/Makefile
src/libsimaka/Makefile src/libsimaka/Makefile
packages/maemo-strongswan/debian/strongswan.install
-1
View File
@@ -2,7 +2,6 @@
etc etc
# libraries # libraries
usr/lib/ipsec/libstrongswan.so* usr/lib/ipsec/libstrongswan.so*
usr/lib/ipsec/libhydra.so*
usr/lib/ipsec/libcharon.so* usr/lib/ipsec/libcharon.so*
# starter etc. # starter etc.
usr/sbin/ipsec usr/sbin/ipsec
packages/strongswan/debian/libstrongswan.install
-1
View File
@@ -2,7 +2,6 @@ etc/strongswan.conf etc/
usr/lib/strongswan/libstrongswan.so* usr/lib/strongswan/ usr/lib/strongswan/libstrongswan.so* usr/lib/strongswan/
usr/lib/strongswan/libcharon.so* usr/lib/strongswan/ usr/lib/strongswan/libcharon.so* usr/lib/strongswan/
usr/lib/strongswan/libtls.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-x509.so* usr/lib/strongswan/plugins/
usr/lib/strongswan/plugins/libstrongswan-pubkey.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/ usr/lib/strongswan/plugins/libstrongswan-xcbc.so* usr/lib/strongswan/plugins/
src/Makefile.am
-4
View File
@@ -4,10 +4,6 @@ if USE_LIBSTRONGSWAN
SUBDIRS += libstrongswan SUBDIRS += libstrongswan
endif endif
if USE_LIBHYDRA
SUBDIRS += libhydra
endif
if USE_LIBIPSEC if USE_LIBIPSEC
SUBDIRS += libipsec SUBDIRS += libipsec
endif endif
src/charon-cmd/Makefile.am
-2
View File
@@ -12,7 +12,6 @@ charon-cmd.o : $(top_builddir)/config.status
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-DIPSEC_DIR=\"${ipsecdir}\" \ -DIPSEC_DIR=\"${ipsecdir}\" \
-DIPSEC_PIDDIR=\"${piddir}\" \ -DIPSEC_PIDDIR=\"${piddir}\" \
@@ -20,6 +19,5 @@ AM_CPPFLAGS = \
charon_cmd_LDADD = \ charon_cmd_LDADD = \
$(top_builddir)/src/libstrongswan/libstrongswan.la \ $(top_builddir)/src/libstrongswan/libstrongswan.la \
$(top_builddir)/src/libhydra/libhydra.la \
$(top_builddir)/src/libcharon/libcharon.la \ $(top_builddir)/src/libcharon/libcharon.la \
-lm $(PTHREADLIB) $(DLLIB) -lm $(PTHREADLIB) $(DLLIB)
src/charon-cmd/charon-cmd.c
-6
View File
@@ -26,7 +26,6 @@
#include <errno.h> #include <errno.h>
#include <library.h> #include <library.h>
#include <hydra.h>
#include <daemon.h> #include <daemon.h>
#include <utils/backtrace.h> #include <utils/backtrace.h>
#include <threading/thread.h> #include <threading/thread.h>
@@ -330,11 +329,6 @@ int main(int argc, char *argv[])
exit(SS_RC_DAEMON_INTEGRITY); exit(SS_RC_DAEMON_INTEGRITY);
} }
} }
atexit(libhydra_deinit);
if (!libhydra_init())
{
exit(SS_RC_INITIALIZATION_FAILED);
}
atexit(libcharon_deinit); atexit(libcharon_deinit);
if (!libcharon_init()) if (!libcharon_init())
{ {
src/charon-nm/Makefile.am
-2
View File
@@ -9,7 +9,6 @@ charon_nm_SOURCES = \
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-DIPSEC_DIR=\"${ipsecdir}\" \ -DIPSEC_DIR=\"${ipsecdir}\" \
-DIPSEC_PIDDIR=\"${piddir}\" \ -DIPSEC_PIDDIR=\"${piddir}\" \
@@ -21,6 +20,5 @@ AM_CFLAGS = \
charon_nm_LDADD = \ charon_nm_LDADD = \
$(top_builddir)/src/libstrongswan/libstrongswan.la \ $(top_builddir)/src/libstrongswan/libstrongswan.la \
$(top_builddir)/src/libhydra/libhydra.la \
$(top_builddir)/src/libcharon/libcharon.la \ $(top_builddir)/src/libcharon/libcharon.la \
-lm $(PTHREADLIB) $(DLLIB) ${nm_LIBS} -lm $(PTHREADLIB) $(DLLIB) ${nm_LIBS}
src/charon-nm/charon-nm.c
-11
View File
@@ -20,7 +20,6 @@
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <hydra.h>
#include <daemon.h> #include <daemon.h>
#include <library.h> #include <library.h>
@@ -177,14 +176,6 @@ int main(int argc, char *argv[])
exit(SS_RC_DAEMON_INTEGRITY); 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()) if (!libcharon_init())
{ {
dbg_syslog(DBG_DMN, 1, "initialization failed - aborting charon-nm"); 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, "integrity tests enabled:");
DBG1(DBG_DMN, "lib 'libstrongswan': passed file and segment integrity tests"); 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, "lib 'libcharon': passed file and segment integrity tests");
DBG1(DBG_DMN, "daemon 'charon-nm': passed file integrity test"); DBG1(DBG_DMN, "daemon 'charon-nm': passed file integrity test");
} }
@@ -260,7 +250,6 @@ int main(int argc, char *argv[])
deinit: deinit:
libcharon_deinit(); libcharon_deinit();
libhydra_deinit();
library_deinit(); library_deinit();
return status; return status;
} }
src/charon-svc/Makefile.am
-2
View File
@@ -6,11 +6,9 @@ charon-svc.o : $(top_builddir)/config.status
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-DPLUGINS=\""${charon_plugins}\"" -DPLUGINS=\""${charon_plugins}\""
charon_svc_LDADD = \ charon_svc_LDADD = \
$(top_builddir)/src/libstrongswan/libstrongswan.la \ $(top_builddir)/src/libstrongswan/libstrongswan.la \
$(top_builddir)/src/libhydra/libhydra.la \
$(top_builddir)/src/libcharon/libcharon.la $(top_builddir)/src/libcharon/libcharon.la
src/charon-svc/charon-svc.c
+8 -15
View File
@@ -14,7 +14,6 @@
*/ */
#include <library.h> #include <library.h>
#include <hydra.h>
#include <daemon.h> #include <daemon.h>
#include <utils/backtrace.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)) if (library_init(NULL, SERVICE_NAME))
{ {
update_status(SERVICE_START_PENDING); update_status(SERVICE_START_PENDING);
if (libhydra_init()) if (libcharon_init())
{ {
charon->load_loggers(charon, levels, TRUE);
print_version();
update_status(SERVICE_START_PENDING); 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); update_status(SERVICE_START_PENDING);
if (charon->initialize(charon, PLUGINS)) lib->plugins->status(lib->plugins, LEVEL_CTRL);
{
update_status(SERVICE_START_PENDING);
lib->plugins->status(lib->plugins, LEVEL_CTRL);
charon->start(charon); charon->start(charon);
status.dwWin32ExitCode = wait(); status.dwWin32ExitCode = wait();
}
update_status(SERVICE_STOP_PENDING);
libcharon_deinit();
} }
update_status(SERVICE_STOP_PENDING); update_status(SERVICE_STOP_PENDING);
libhydra_deinit(); libcharon_deinit();
} }
update_status(SERVICE_STOP_PENDING); update_status(SERVICE_STOP_PENDING);
library_deinit(); library_deinit();
src/charon-systemd/Makefile.am
-2
View File
@@ -7,13 +7,11 @@ charon-systemd.o : $(top_builddir)/config.status
charon_systemd_CPPFLAGS = \ charon_systemd_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
$(systemd_CFLAGS) $(systemd_daemon_CFLAGS) $(systemd_journal_CFLAGS) \ $(systemd_CFLAGS) $(systemd_daemon_CFLAGS) $(systemd_journal_CFLAGS) \
-DPLUGINS=\""${charon_plugins}\"" -DPLUGINS=\""${charon_plugins}\""
charon_systemd_LDADD = \ charon_systemd_LDADD = \
$(top_builddir)/src/libstrongswan/libstrongswan.la \ $(top_builddir)/src/libstrongswan/libstrongswan.la \
$(top_builddir)/src/libhydra/libhydra.la \
$(top_builddir)/src/libcharon/libcharon.la \ $(top_builddir)/src/libcharon/libcharon.la \
$(systemd_LIBS) $(systemd_daemon_LIBS) $(systemd_journal_LIBS) -lm $(PTHREADLIB) $(DLLIB) $(systemd_LIBS) $(systemd_daemon_LIBS) $(systemd_journal_LIBS) -lm $(PTHREADLIB) $(DLLIB)
src/charon-systemd/charon-systemd.c
-7
View File
@@ -31,7 +31,6 @@
#include <systemd/sd-daemon.h> #include <systemd/sd-daemon.h>
#include <systemd/sd-journal.h> #include <systemd/sd-journal.h>
#include <hydra.h>
#include <daemon.h> #include <daemon.h>
#include <library.h> #include <library.h>
@@ -355,12 +354,6 @@ int main(int argc, char *argv[])
sd_notifyf(0, "STATUS=integrity check of charon-systemd failed"); sd_notifyf(0, "STATUS=integrity check of charon-systemd failed");
return SS_RC_INITIALIZATION_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); atexit(libcharon_deinit);
if (!libcharon_init()) if (!libcharon_init())
{ {
src/charon-tkm/Makefile.am
+2 -4
View File
@@ -4,15 +4,13 @@ OBJ = $(abs_top_builddir)/src
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-include $(abs_top_builddir)/config.h \ -include $(abs_top_builddir)/config.h \
-I$(SRC)/libstrongswan \ -I$(SRC)/libstrongswan \
-I$(SRC)/libhydra \
-I$(SRC)/libcharon -I$(SRC)/libcharon
LIBLD = \ LIBLD = \
-L$(OBJ)/libstrongswan/.libs \ -L$(OBJ)/libstrongswan/.libs \
-L$(OBJ)/libhydra/.libs \
-L$(OBJ)/libcharon/.libs -L$(OBJ)/libcharon/.libs
LIBPT = $(OBJ)/libstrongswan/.libs:$(OBJ)/libhydra/.libs:$(OBJ)/libcharon/.libs LIBPT = $(OBJ)/libstrongswan/.libs:$(OBJ)/libcharon/.libs
LIBFL = -lstrongswan -lhydra -lcharon LIBFL = -lstrongswan -lcharon
DEFS += -DPLUGINS=\""$(PLUGINS)\"" -DIPSEC_PIDDIR=\"${piddir}\" DEFS += -DPLUGINS=\""$(PLUGINS)\"" -DIPSEC_PIDDIR=\"${piddir}\"
src/charon-tkm/src/charon-tkm.c
-10
View File
@@ -26,7 +26,6 @@
#include <libgen.h> #include <libgen.h>
#include <errno.h> #include <errno.h>
#include <hydra.h>
#include <daemon.h> #include <daemon.h>
#include <library.h> #include <library.h>
#include <utils/backtrace.h> #include <utils/backtrace.h>
@@ -256,14 +255,6 @@ int main(int argc, char *argv[])
exit(status); 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()) if (!libcharon_init())
{ {
dbg_syslog(DBG_DMN, 1, "initialization failed - aborting %s", dmn_name); dbg_syslog(DBG_DMN, 1, "initialization failed - aborting %s", dmn_name);
@@ -391,7 +382,6 @@ int main(int argc, char *argv[])
deinit: deinit:
destroy_dh_mapping(); destroy_dh_mapping();
libcharon_deinit(); libcharon_deinit();
libhydra_deinit();
library_deinit(); library_deinit();
tkm_deinit(); tkm_deinit();
return status; return status;
src/charon-tkm/tests/tests.c
-5
View File
@@ -18,7 +18,6 @@
#include <tests/test_runner.h> #include <tests/test_runner.h>
#include <library.h> #include <library.h>
#include <hydra.h>
#include <daemon.h> #include <daemon.h>
#include "tkm.h" #include "tkm.h"
@@ -50,7 +49,6 @@ static bool test_runner_init(bool init)
if (init) if (init)
{ {
libhydra_init();
libcharon_init(); libcharon_init();
lib->settings->set_int(lib->settings, lib->settings->set_int(lib->settings,
"test-runner.filelog.stdout.default", 0); "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", plugin_loader_add_plugindirs(BUILDDIR "/src/libstrongswan/plugins",
PLUGINS); PLUGINS);
plugin_loader_add_plugindirs(BUILDDIR "/src/libhydra/plugins",
PLUGINS);
plugin_loader_add_plugindirs(BUILDDIR "/src/libcharon/plugins", plugin_loader_add_plugindirs(BUILDDIR "/src/libcharon/plugins",
PLUGINS); PLUGINS);
if (charon->initialize(charon, PLUGINS)) if (charon->initialize(charon, PLUGINS))
@@ -95,7 +91,6 @@ static bool test_runner_init(bool init)
destroy_dh_mapping(); destroy_dh_mapping();
libcharon_deinit(); libcharon_deinit();
libhydra_deinit();
return result; return result;
} }
src/charon/Android.mk
+1 -2
View File
@@ -8,7 +8,6 @@ charon.c
# build charon ----------------------------------------------------------------- # build charon -----------------------------------------------------------------
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(strongswan_PATH)/src/libhydra \
$(strongswan_PATH)/src/libcharon \ $(strongswan_PATH)/src/libcharon \
$(strongswan_PATH)/src/libstrongswan $(strongswan_PATH)/src/libstrongswan
@@ -23,7 +22,7 @@ LOCAL_ARM_MODE := arm
LOCAL_PRELINK_MODULE := false LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES += libstrongswan libhydra libcharon LOCAL_SHARED_LIBRARIES += libstrongswan libcharon
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
src/charon/Makefile.am
-2
View File
@@ -7,7 +7,6 @@ charon.o : $(top_builddir)/config.status
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-DIPSEC_DIR=\"${ipsecdir}\" \ -DIPSEC_DIR=\"${ipsecdir}\" \
-DIPSEC_PIDDIR=\"${piddir}\" \ -DIPSEC_PIDDIR=\"${piddir}\" \
@@ -15,7 +14,6 @@ AM_CPPFLAGS = \
charon_LDADD = \ charon_LDADD = \
$(top_builddir)/src/libstrongswan/libstrongswan.la \ $(top_builddir)/src/libstrongswan/libstrongswan.la \
$(top_builddir)/src/libhydra/libhydra.la \
$(top_builddir)/src/libcharon/libcharon.la \ $(top_builddir)/src/libcharon/libcharon.la \
-lm $(PTHREADLIB) $(DLLIB) -lm $(PTHREADLIB) $(DLLIB)
src/charon/charon.c
-11
View File
@@ -27,7 +27,6 @@
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <hydra.h>
#include <daemon.h> #include <daemon.h>
#include <library.h> #include <library.h>
@@ -309,14 +308,6 @@ int main(int argc, char *argv[])
exit(SS_RC_DAEMON_INTEGRITY); 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()) if (!libcharon_init())
{ {
dbg_stderr(DBG_DMN, 1, "initialization failed - aborting charon"); 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, "integrity tests enabled:");
DBG1(DBG_DMN, "lib 'libstrongswan': passed file and segment integrity tests"); 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, "lib 'libcharon': passed file and segment integrity tests");
DBG1(DBG_DMN, "daemon 'charon': passed file integrity test"); DBG1(DBG_DMN, "daemon 'charon': passed file integrity test");
} }
@@ -457,7 +447,6 @@ int main(int argc, char *argv[])
deinit: deinit:
libcharon_deinit(); libcharon_deinit();
libhydra_deinit();
library_deinit(); library_deinit();
return status; return status;
} }
src/checksum/Makefile.am
-10
View File
@@ -8,7 +8,6 @@ EXTRA_PROGRAMS = checksum_builder
checksum_builder_SOURCES = checksum_builder.c checksum_builder_SOURCES = checksum_builder.c
checksum_builder_LDADD = \ checksum_builder_LDADD = \
$(top_builddir)/src/libstrongswan/libstrongswan.la \ $(top_builddir)/src/libstrongswan/libstrongswan.la \
$(top_builddir)/src/libhydra/libhydra.la \
$(top_builddir)/src/libcharon/libcharon.la \ $(top_builddir)/src/libcharon/libcharon.la \
$(DLLIB) $(DLLIB)
checksum_builder_LDFLAGS = -rpath '$(DESTDIR)$(ipseclibdir)' checksum_builder_LDFLAGS = -rpath '$(DESTDIR)$(ipseclibdir)'
@@ -17,7 +16,6 @@ CLEANFILES = checksum.c $(EXTRA_PROGRAMS)
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-DPLUGINDIR=\"${DESTDIR}${plugindir}\" -DPLUGINDIR=\"${DESTDIR}${plugindir}\"
@@ -35,14 +33,6 @@ if !MONOLITHIC
AM_CPPFLAGS += -DS_PLUGINS=\""${s_plugins}\"" AM_CPPFLAGS += -DS_PLUGINS=\""${s_plugins}\""
endif 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 if USE_LIBIPSEC
deps += $(top_builddir)/src/libipsec/libipsec.la deps += $(top_builddir)/src/libipsec/libipsec.la
libs += $(DESTDIR)$(ipseclibdir)/libipsec.so libs += $(DESTDIR)$(ipseclibdir)/libipsec.so
src/checksum/checksum_builder.c
+1 -6
View File
@@ -19,7 +19,6 @@
#include <dlfcn.h> #include <dlfcn.h>
#include <library.h> #include <library.h>
#include <hydra.h>
#include <daemon.h> #include <daemon.h>
#include <collections/enumerator.h> #include <collections/enumerator.h>
@@ -128,9 +127,8 @@ int main(int argc, char* argv[])
{ {
int i; int i;
/* forces link against libhydra/libcharon, imports symbols needed to /* forces link against libcharon, imports symbols needed to
* dlopen plugins */ * dlopen plugins */
hydra = NULL;
charon = NULL; charon = NULL;
/* avoid confusing leak reports in build process */ /* avoid confusing leak reports in build process */
@@ -159,9 +157,6 @@ int main(int argc, char* argv[])
#ifdef S_PLUGINS #ifdef S_PLUGINS
build_plugin_checksums(S_PLUGINS); build_plugin_checksums(S_PLUGINS);
#endif #endif
#ifdef H_PLUGINS
build_plugin_checksums(H_PLUGINS);
#endif
#ifdef T_PLUGINS #ifdef T_PLUGINS
build_plugin_checksums(T_PLUGINS); build_plugin_checksums(T_PLUGINS);
#endif #endif
src/conftest/Makefile.am
-2
View File
@@ -2,7 +2,6 @@ ipsec_PROGRAMS = conftest
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-DPLUGINS=\""${charon_plugins}\"" -DPLUGINS=\""${charon_plugins}\""
@@ -20,7 +19,6 @@ conftest_SOURCES = conftest.c conftest.h config.c config.h actions.c actions.h \
conftest_LDADD = \ conftest_LDADD = \
$(top_builddir)/src/libstrongswan/libstrongswan.la \ $(top_builddir)/src/libstrongswan/libstrongswan.la \
$(top_builddir)/src/libhydra/libhydra.la \
$(top_builddir)/src/libcharon/libcharon.la \ $(top_builddir)/src/libcharon/libcharon.la \
-lm $(PTHREADLIB) $(DLLIB) -lm $(PTHREADLIB) $(DLLIB)
src/conftest/conftest.c
-8
View File
@@ -356,7 +356,6 @@ static void cleanup()
free(conftest->suite_dir); free(conftest->suite_dir);
free(conftest); free(conftest);
libcharon_deinit(); libcharon_deinit();
libhydra_deinit();
library_deinit(); library_deinit();
} }
@@ -442,16 +441,9 @@ int main(int argc, char *argv[])
library_deinit(); library_deinit();
return SS_RC_LIBSTRONGSWAN_INTEGRITY; return SS_RC_LIBSTRONGSWAN_INTEGRITY;
} }
if (!libhydra_init())
{
libhydra_deinit();
library_deinit();
return SS_RC_INITIALIZATION_FAILED;
}
if (!libcharon_init()) if (!libcharon_init())
{ {
libcharon_deinit(); libcharon_deinit();
libhydra_deinit();
library_deinit(); library_deinit();
return SS_RC_INITIALIZATION_FAILED; return SS_RC_INITIALIZATION_FAILED;
} }
src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
-1
View File
@@ -848,7 +848,6 @@ public class CharonVpnService extends VpnService implements Runnable
System.loadLibrary("imcv"); System.loadLibrary("imcv");
} }
System.loadLibrary("hydra");
System.loadLibrary("charon"); System.loadLibrary("charon");
System.loadLibrary("ipsec"); System.loadLibrary("ipsec");
} }
src/frontends/android/app/src/main/jni/Android.mk
-1
View File
@@ -71,7 +71,6 @@ strongswan_BUILD := \
libandroidbridge \ libandroidbridge \
strongswan/src/libipsec \ strongswan/src/libipsec \
strongswan/src/libcharon \ strongswan/src/libcharon \
strongswan/src/libhydra \
strongswan/src/libstrongswan strongswan/src/libstrongswan
ifneq ($(strongswan_USE_BYOD),) ifneq ($(strongswan_USE_BYOD),)
src/frontends/android/app/src/main/jni/libandroidbridge/Android.mk
+1 -2
View File
@@ -25,7 +25,6 @@ endif
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(strongswan_PATH)/src/libipsec \ $(strongswan_PATH)/src/libipsec \
$(strongswan_PATH)/src/libhydra \
$(strongswan_PATH)/src/libcharon \ $(strongswan_PATH)/src/libcharon \
$(strongswan_PATH)/src/libstrongswan $(strongswan_PATH)/src/libstrongswan
@@ -54,7 +53,7 @@ LOCAL_PRELINK_MODULE := false
LOCAL_LDLIBS := -llog LOCAL_LDLIBS := -llog
LOCAL_SHARED_LIBRARIES := libstrongswan libhydra libipsec libcharon LOCAL_SHARED_LIBRARIES := libstrongswan libipsec libcharon
ifneq ($(strongswan_USE_BYOD),) ifneq ($(strongswan_USE_BYOD),)
LOCAL_SHARED_LIBRARIES += libimcv libtncif libtnccs LOCAL_SHARED_LIBRARIES += libimcv libtncif libtnccs
src/frontends/android/app/src/main/jni/libandroidbridge/android_jni.c
-1
View File
@@ -37,7 +37,6 @@ static struct {
{ "libtnccs.so", NULL }, { "libtnccs.so", NULL },
{ "libimcv.so", NULL }, { "libimcv.so", NULL },
#endif #endif
{ "libhydra.so", NULL },
{ "libcharon.so", NULL }, { "libcharon.so", NULL },
{ "libipsec.so", NULL }, { "libipsec.so", NULL },
}; };
src/frontends/android/app/src/main/jni/libandroidbridge/charonservice.c
-12
View File
@@ -35,7 +35,6 @@
#endif #endif
#include <daemon.h> #include <daemon.h>
#include <hydra.h>
#include <ipsec.h> #include <ipsec.h>
#include <library.h> #include <library.h>
#include <threading/thread.h> #include <threading/thread.h>
@@ -606,17 +605,9 @@ JNI_METHOD(CharonVpnService, initializeCharon, jboolean,
set_options(logfile); set_options(logfile);
free(logfile); free(logfile);
if (!libhydra_init())
{
libhydra_deinit();
library_deinit();
return FALSE;
}
if (!libipsec_init()) if (!libipsec_init())
{ {
libipsec_deinit(); libipsec_deinit();
libhydra_deinit();
library_deinit(); library_deinit();
return FALSE; return FALSE;
} }
@@ -625,7 +616,6 @@ JNI_METHOD(CharonVpnService, initializeCharon, jboolean,
{ {
libcharon_deinit(); libcharon_deinit();
libipsec_deinit(); libipsec_deinit();
libhydra_deinit();
library_deinit(); library_deinit();
return FALSE; return FALSE;
} }
@@ -657,7 +647,6 @@ JNI_METHOD(CharonVpnService, initializeCharon, jboolean,
libcharon_deinit(); libcharon_deinit();
charonservice_deinit(env); charonservice_deinit(env);
libipsec_deinit(); libipsec_deinit();
libhydra_deinit();
library_deinit(); library_deinit();
return FALSE; return FALSE;
} }
@@ -687,7 +676,6 @@ JNI_METHOD(CharonVpnService, deinitializeCharon, void)
libcharon_deinit(); libcharon_deinit();
charonservice_deinit(env); charonservice_deinit(env);
libipsec_deinit(); libipsec_deinit();
libhydra_deinit();
library_deinit(); library_deinit();
} }
src/frontends/osx/charon-xpc/charon-xpc.c
-6
View File
@@ -22,7 +22,6 @@
#include <errno.h> #include <errno.h>
#include <library.h> #include <library.h>
#include <hydra.h>
#include <daemon.h> #include <daemon.h>
#include <threading/thread.h> #include <threading/thread.h>
#include <utils/backtrace.h> #include <utils/backtrace.h>
@@ -170,11 +169,6 @@ int main(int argc, char *argv[])
exit(SS_RC_DAEMON_INTEGRITY); exit(SS_RC_DAEMON_INTEGRITY);
} }
} }
atexit(libhydra_deinit);
if (!libhydra_init())
{
exit(SS_RC_INITIALIZATION_FAILED);
}
atexit(libcharon_deinit); atexit(libcharon_deinit);
if (!libcharon_init()) if (!libcharon_init())
{ {
src/frontends/osx/strongSwan.xcodeproj/project.pbxproj
-8
View File
@@ -478,7 +478,6 @@
/usr/include, /usr/include,
../../libstrongswan, ../../libstrongswan,
../../libcharon, ../../libcharon,
../../libhydra,
); );
INFOPLIST_FILE = "charon-xpc/charon-xpc-Info.plist"; INFOPLIST_FILE = "charon-xpc/charon-xpc-Info.plist";
INSTALL_PATH = /; INSTALL_PATH = /;
@@ -486,7 +485,6 @@
/usr/lib, /usr/lib,
../../libstrongswan/.libs, ../../libstrongswan/.libs,
../../libcharon/.libs, ../../libcharon/.libs,
../../libhydra/.libs,
); );
MACOSX_DEPLOYMENT_TARGET = 10.7; MACOSX_DEPLOYMENT_TARGET = 10.7;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
@@ -500,8 +498,6 @@
"-force_load", "-force_load",
../../libipsec/.libs/libipsec.a, ../../libipsec/.libs/libipsec.a,
"-force_load", "-force_load",
../../libhydra/.libs/libhydra.a,
"-force_load",
../../libcharon/.libs/libcharon.a, ../../libcharon/.libs/libcharon.a,
"-sectcreate", "-sectcreate",
__TEXT, __TEXT,
@@ -531,7 +527,6 @@
/usr/include, /usr/include,
../../libstrongswan, ../../libstrongswan,
../../libcharon, ../../libcharon,
../../libhydra,
); );
INFOPLIST_FILE = "charon-xpc/charon-xpc-Info.plist"; INFOPLIST_FILE = "charon-xpc/charon-xpc-Info.plist";
INSTALL_PATH = /; INSTALL_PATH = /;
@@ -539,7 +534,6 @@
/usr/lib, /usr/lib,
../../libstrongswan/.libs, ../../libstrongswan/.libs,
../../libcharon/.libs, ../../libcharon/.libs,
../../libhydra/.libs,
); );
MACOSX_DEPLOYMENT_TARGET = 10.7; MACOSX_DEPLOYMENT_TARGET = 10.7;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
@@ -553,8 +547,6 @@
"-force_load", "-force_load",
../../libipsec/.libs/libipsec.a, ../../libipsec/.libs/libipsec.a,
"-force_load", "-force_load",
../../libhydra/.libs/libhydra.a,
"-force_load",
../../libcharon/.libs/libcharon.a, ../../libcharon/.libs/libcharon.a,
"-sectcreate", "-sectcreate",
__TEXT, __TEXT,
src/libcharon/Android.mk
+1 -2
View File
@@ -235,7 +235,6 @@ endif
# build libcharon -------------------------------------------------------------- # build libcharon --------------------------------------------------------------
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(strongswan_PATH)/src/libhydra \
$(strongswan_PATH)/src/libstrongswan $(strongswan_PATH)/src/libstrongswan
LOCAL_CFLAGS := $(strongswan_CFLAGS) LOCAL_CFLAGS := $(strongswan_CFLAGS)
@@ -248,6 +247,6 @@ LOCAL_ARM_MODE := arm
LOCAL_PRELINK_MODULE := false LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES += libstrongswan libhydra LOCAL_SHARED_LIBRARIES += libstrongswan
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
src/libcharon/Makefile.am
-2
View File
@@ -146,7 +146,6 @@ daemon.lo : $(top_builddir)/config.status
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I${linux_headers} \ -I${linux_headers} \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-DIPSEC_DIR=\"${ipsecdir}\" \ -DIPSEC_DIR=\"${ipsecdir}\" \
-DIPSEC_PIDDIR=\"${piddir}\" -DIPSEC_PIDDIR=\"${piddir}\"
@@ -156,7 +155,6 @@ AM_LDFLAGS = \
libcharon_la_LIBADD = \ libcharon_la_LIBADD = \
$(top_builddir)/src/libstrongswan/libstrongswan.la \ $(top_builddir)/src/libstrongswan/libstrongswan.la \
$(top_builddir)/src/libhydra/libhydra.la \
-lm $(PTHREADLIB) $(DLLIB) $(SOCKLIB) -lm $(PTHREADLIB) $(DLLIB) $(SOCKLIB)
if USE_WINDOWS if USE_WINDOWS
src/libcharon/plugins/addrblock/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/android_dns/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/android_log/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/attr/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/attr_sql/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/certexpire/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-DIPSEC_PIDDIR=\"${piddir}\" -DIPSEC_PIDDIR=\"${piddir}\"
src/libcharon/plugins/connmark/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/coupling/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/dhcp/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/dnscert/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/duplicheck/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-DIPSEC_PIDDIR=\"${piddir}\" -DIPSEC_PIDDIR=\"${piddir}\"
src/libcharon/plugins/eap_aka/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-I$(top_srcdir)/src/libsimaka -I$(top_srcdir)/src/libsimaka
src/libcharon/plugins/eap_aka_3gpp2/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-I$(top_srcdir)/src/libsimaka -I$(top_srcdir)/src/libsimaka
src/libcharon/plugins/eap_dynamic/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/eap_gtc/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/eap_identity/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/eap_md5/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/eap_mschapv2/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/eap_peap/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-I$(top_srcdir)/src/libtls -I$(top_srcdir)/src/libtls
src/libcharon/plugins/eap_radius/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-I$(top_srcdir)/src/libradius -I$(top_srcdir)/src/libradius
src/libcharon/plugins/eap_sim/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-I$(top_srcdir)/src/libsimaka -I$(top_srcdir)/src/libsimaka
src/libcharon/plugins/eap_sim_file/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-I$(top_srcdir)/src/libsimaka \ -I$(top_srcdir)/src/libsimaka \
-DIPSEC_CONFDIR=\"${sysconfdir}\" -DIPSEC_CONFDIR=\"${sysconfdir}\"
src/libcharon/plugins/eap_sim_pcsc/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-I$(top_srcdir)/src/libsimaka -I$(top_srcdir)/src/libsimaka
src/libcharon/plugins/eap_simaka_pseudonym/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-I$(top_srcdir)/src/libsimaka -I$(top_srcdir)/src/libsimaka
src/libcharon/plugins/eap_simaka_reauth/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-I$(top_srcdir)/src/libsimaka -I$(top_srcdir)/src/libsimaka
src/libcharon/plugins/eap_simaka_sql/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-I$(top_srcdir)/src/libsimaka \ -I$(top_srcdir)/src/libsimaka \
-DIPSEC_CONFDIR=\"${sysconfdir}\" -DIPSEC_CONFDIR=\"${sysconfdir}\"
src/libcharon/plugins/eap_tls/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-I$(top_srcdir)/src/libtls -I$(top_srcdir)/src/libtls
src/libcharon/plugins/eap_tnc/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-I$(top_srcdir)/src/libtls \ -I$(top_srcdir)/src/libtls \
-I$(top_srcdir)/src/libtncif \ -I$(top_srcdir)/src/libtncif \
src/libcharon/plugins/eap_ttls/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-I$(top_srcdir)/src/libtls \ -I$(top_srcdir)/src/libtls \
-I$(top_srcdir)/src/libradius -I$(top_srcdir)/src/libradius
src/libcharon/plugins/error_notify/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-DIPSEC_PIDDIR=\"${piddir}\" -DIPSEC_PIDDIR=\"${piddir}\"
src/libcharon/plugins/ext_auth/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/farp/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/forecast/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/ha/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-DIPSEC_PIDDIR=\"${piddir}\" -DIPSEC_PIDDIR=\"${piddir}\"
src/libcharon/plugins/ipseckey/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/kernel_iph/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/kernel_libipsec/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-I$(top_srcdir)/src/libipsec -I$(top_srcdir)/src/libipsec
src/libcharon/plugins/kernel_wfp/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/led/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/load_tester/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-DIPSEC_PIDDIR=\"${piddir}\" -DIPSEC_PIDDIR=\"${piddir}\"
src/libcharon/plugins/lookip/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-DIPSEC_PIDDIR=\"${piddir}\" -DIPSEC_PIDDIR=\"${piddir}\"
src/libcharon/plugins/maemo/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/medcli/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/medsrv/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/osx_attr/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/radattr/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-I$(top_srcdir)/src/libradius -I$(top_srcdir)/src/libradius
src/libcharon/plugins/resolve/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-DRESOLV_CONF=\"${resolv_conf}\" -DRESOLV_CONF=\"${resolv_conf}\"
src/libcharon/plugins/smp/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-DIPSEC_PIDDIR=\"${piddir}\" -DIPSEC_PIDDIR=\"${piddir}\"
src/libcharon/plugins/socket_default/Makefile.am
-1
View File
@@ -1,7 +1,6 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I${linux_headers} \ -I${linux_headers} \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/socket_dynamic/Makefile.am
-1
View File
@@ -1,7 +1,6 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I${linux_headers} \ -I${linux_headers} \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/socket_win/Makefile.am
-1
View File
@@ -1,7 +1,6 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I${linux_headers} \ -I${linux_headers} \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/sql/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/stroke/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-I$(top_srcdir)/src/stroke \ -I$(top_srcdir)/src/stroke \
-DIPSEC_CONFDIR=\"${sysconfdir}\" \ -DIPSEC_CONFDIR=\"${sysconfdir}\" \
src/libcharon/plugins/systime_fix/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
if MONOLITHIC if MONOLITHIC
src/libcharon/plugins/tnc_ifmap/Makefile.am
-1
View File
@@ -1,7 +1,6 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libtls \ -I$(top_srcdir)/src/libtls \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/tnc_pdp/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-I$(top_srcdir)/src/libradius \ -I$(top_srcdir)/src/libradius \
-I$(top_srcdir)/src/libtncif \ -I$(top_srcdir)/src/libtncif \
src/libcharon/plugins/uci/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/unity/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/updown/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/vici/Makefile.am
-1
View File
@@ -1,7 +1,6 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libstrongswan/plugins/pubkey \ -I$(top_srcdir)/src/libstrongswan/plugins/pubkey \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-DIPSEC_PIDDIR=\"${piddir}\" -DIPSEC_PIDDIR=\"${piddir}\"
src/libcharon/plugins/whitelist/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-DIPSEC_PIDDIR=\"${piddir}\" -DIPSEC_PIDDIR=\"${piddir}\"
src/libcharon/plugins/xauth_eap/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/xauth_generic/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/xauth_noauth/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/plugins/xauth_pam/Makefile.am
-1
View File
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libcharon
AM_CFLAGS = \ AM_CFLAGS = \
src/libcharon/tests/Makefile.am
-2
View File
@@ -10,7 +10,6 @@ libcharon_tests_SOURCES = \
libcharon_tests_CFLAGS = \ libcharon_tests_CFLAGS = \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libstrongswan/tests \ -I$(top_srcdir)/src/libstrongswan/tests \
-DPLUGINDIR=\""$(abs_top_builddir)/src/libstrongswan/plugins\"" \ -DPLUGINDIR=\""$(abs_top_builddir)/src/libstrongswan/plugins\"" \
@@ -20,6 +19,5 @@ libcharon_tests_CFLAGS = \
libcharon_tests_LDFLAGS = @COVERAGE_LDFLAGS@ libcharon_tests_LDFLAGS = @COVERAGE_LDFLAGS@
libcharon_tests_LDADD = \ libcharon_tests_LDADD = \
$(top_builddir)/src/libcharon/libcharon.la \ $(top_builddir)/src/libcharon/libcharon.la \
$(top_builddir)/src/libhydra/libhydra.la \
$(top_builddir)/src/libstrongswan/libstrongswan.la \ $(top_builddir)/src/libstrongswan/libstrongswan.la \
$(top_builddir)/src/libstrongswan/tests/libtest.la $(top_builddir)/src/libstrongswan/tests/libtest.la
src/libcharon/tests/libcharon_tests.c
-3
View File
@@ -14,7 +14,6 @@
*/ */
#include <test_runner.h> #include <test_runner.h>
#include <hydra.h>
#include <daemon.h> #include <daemon.h>
/* declare test suite constructors */ /* declare test suite constructors */
@@ -39,7 +38,6 @@ static bool test_runner_init(bool init)
{ {
char *plugins, *plugindir; char *plugins, *plugindir;
libhydra_init();
libcharon_init(); libcharon_init();
plugins = getenv("TESTS_PLUGINS") ?: plugins = getenv("TESTS_PLUGINS") ?:
@@ -59,7 +57,6 @@ static bool test_runner_init(bool init)
lib->processor->cancel(lib->processor); lib->processor->cancel(lib->processor);
lib->plugins->unload(lib->plugins); lib->plugins->unload(lib->plugins);
libcharon_deinit(); libcharon_deinit();
libhydra_deinit();
} }
return TRUE; return TRUE;
} }
src/libhydra/Android.mk
-29
View File
@@ -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)

Some files were not shown because too many files have changed in this diff Show More