fixed integrity tests of plugins using libtls or libtnccs

This commit is contained in:
Andreas Steffen
2011-11-02 06:42:08 +01:00
parent 6ae024392b
commit b597ac4a4c
14 changed files with 43 additions and 18 deletions
+7
View File
@@ -30,6 +30,13 @@ if !MONOLITHIC
endif
endif
if USE_LIBTNCCS
libs += $(top_builddir)/src/libtnccs/.libs/libtnccs.so
checksum_builder_LDADD += $(top_builddir)/src/libtnccs/libtnccs.la
INCLUDES += -I$(top_srcdir)/src/libtncif -I$(top_srcdir)/src/libtnccs
AM_CFLAGS += -DHAS_TNC
endif
if USE_CHARON
libs += $(top_builddir)/src/libcharon/.libs/libcharon.so
libs += $(top_builddir)/src/charon/.libs/charon
+9
View File
@@ -23,6 +23,10 @@
#include <daemon.h>
#include <utils/enumerator.h>
#ifdef HAS_TNC
#include <tnc/tnc.h>
#endif
/* we need to fake the pluto symbol to dlopen() the xauth plugin */
void *pluto;
@@ -133,6 +137,11 @@ int main(int argc, char* argv[])
hydra = NULL;
charon = NULL;
#ifdef HAS_TNC
/* forces link against libtnccs */
tnc = NULL;
#endif
/* avoid confusing leak reports in build process */
setenv("LEAK_DETECTIVE_DISABLE", "1", 0);
/* don't use a strongswan.conf, forces integrity check to disabled */