From 02222dfa651f23c92dc32754464743021da8c6a8 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Fri, 12 Mar 2010 17:20:36 +0100 Subject: [PATCH] Make integrity tests compatible with libcharon. This does currently not work because libtool relinks libcharon on install, thus changing the checksum. --- src/checksum/Makefile.am | 3 ++- src/checksum/checksum_builder.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/checksum/Makefile.am b/src/checksum/Makefile.am index d0413e6..4533eb8 100644 --- a/src/checksum/Makefile.am +++ b/src/checksum/Makefile.am @@ -12,10 +12,11 @@ CLEANFILES = checksum.c INCLUDES = -I$(top_srcdir)/src/libstrongswan AM_CFLAGS = -rdynamic -libs = $(shell find $(top_builddir)/src/libstrongswan $(top_builddir)/src/charon \ +libs = $(shell find $(top_builddir)/src/libstrongswan $(top_builddir)/src/libcharon \ -name 'libstrongswan*.so') if USE_CHARON + libs += $(top_builddir)/src/libcharon/.libs/libcharon.so libs += $(top_builddir)/src/charon/.libs/charon endif diff --git a/src/checksum/checksum_builder.c b/src/checksum/checksum_builder.c index 964cc71..be57f1d 100644 --- a/src/checksum/checksum_builder.c +++ b/src/checksum/checksum_builder.c @@ -78,6 +78,11 @@ int main(int argc, char* argv[]) name = strdup("libstrongswan\","); sname = strdup("library_init"); } + else if (strstr(path, "libcharon.so")) + { + name = strdup("libcharon\","); + sname = strdup("libcharon_init"); + } else if (strstr(path, "pool")) { name = strdup("pool\","); -- 2.7.4