diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2011-11-02 06:41:48 +0100 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2011-11-02 06:42:08 +0100 |
| commit | b597ac4a4cbcd9197b886d743c75d58293264580 (patch) | |
| tree | 219d64ab562fda0970200941c0d86481703372cb /src/checksum | |
| parent | 6ae024392b1ceac1b00a185dc96b80a025ac86e1 (diff) | |
| download | strongswan-b597ac4a4cbcd9197b886d743c75d58293264580.tar.bz2 strongswan-b597ac4a4cbcd9197b886d743c75d58293264580.tar.xz | |
fixed integrity tests of plugins using libtls or libtnccs
Diffstat (limited to 'src/checksum')
| -rw-r--r-- | src/checksum/Makefile.am | 7 | ||||
| -rw-r--r-- | src/checksum/checksum_builder.c | 9 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/checksum/Makefile.am b/src/checksum/Makefile.am index fc48438c2..fe6cf79b4 100644 --- a/src/checksum/Makefile.am +++ b/src/checksum/Makefile.am @@ -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 diff --git a/src/checksum/checksum_builder.c b/src/checksum/checksum_builder.c index a4d9aa084..4bc387da8 100644 --- a/src/checksum/checksum_builder.c +++ b/src/checksum/checksum_builder.c @@ -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 */ |