summaryrefslogtreecommitdiff
path: root/src/charon/charon.c
diff options
context:
space:
mode:
authorYves-Alexis Perez <corsac@debian.org>2016-03-24 11:59:32 +0100
committerYves-Alexis Perez <corsac@debian.org>2016-03-24 11:59:32 +0100
commit14275f20dd704bd6c3b97b234940c325db082c83 (patch)
treebfa3475c29649e094eaa6e055711e34a9f0a65f9 /src/charon/charon.c
parent26962344688a8a9ef6d5da2a8b16e41cf2757a87 (diff)
parent518dd33c94e041db0444c7d1f33da363bb8e3faf (diff)
downloadvyos-strongswan-14275f20dd704bd6c3b97b234940c325db082c83.tar.gz
vyos-strongswan-14275f20dd704bd6c3b97b234940c325db082c83.zip
Merge tag 'upstream/5.4.0'
Upstream version 5.4.0
Diffstat (limited to 'src/charon/charon.c')
-rw-r--r--src/charon/charon.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/charon/charon.c b/src/charon/charon.c
index 4c2a9a477..116ce7e93 100644
--- a/src/charon/charon.c
+++ b/src/charon/charon.c
@@ -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;
}