-make sure to link against right libgcrypt, enable abort of gnunet-revocation even if identity service is not running

4 files changed, 20 insertions, 9 deletions

diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am
index 155fa9acb..b60d38d80 100644
--- a/src/nse/Makefile.am
+++ b/src/nse/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
 endif
 
 if USE_COVERAGE
@@ -30,7 +30,7 @@ libgnunetnse_la_LDFLAGS = \
 
 
 libexec_PROGRAMS = \
- gnunet-service-nse 
+ gnunet-service-nse
 
 if HAVE_TESTING
 noinst_PROGRAMS = \
@@ -46,19 +46,20 @@ gnunet_nse_profiler_LDADD = -lm \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(GN_LIBINTL)
 gnunet_nse_profiler_DEPENDENCIES = \
-  libgnunetnse.la                                
+  libgnunetnse.la
 
 gnunet_service_nse_SOURCES = \
- gnunet-service-nse.c         
+ gnunet-service-nse.c
 gnunet_service_nse_LDADD = \
   $(top_builddir)/src/nse/libgnunetnse.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(LIBGCRYPT_LIBS) \
   -lm -lgcrypt \
   $(GN_LIBINTL)
 gnunet_service_nse_DEPENDENCIES = \
-  libgnunetnse.la                                
+  libgnunetnse.la
 if ENABLE_NSE_HISTOGRAM
   gnunet_service_nse_LDADD += \
     $(top_builddir)/src/testbed/libgnunettestbedlogger.la
@@ -79,7 +80,7 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
-TESTS = $(check_PROGRAMS) 
+TESTS = $(check_PROGRAMS)
 endif
 
 test_nse_api_SOURCES = \
@@ -87,7 +88,7 @@ test_nse_api_SOURCES = \
 test_nse_api_LDADD = \
   $(top_builddir)/src/nse/libgnunetnse.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_nse_multipeer_SOURCES = \
  test_nse_multipeer.c
@@ -101,7 +102,8 @@ perf_kdf_SOURCES = \
  perf_kdf.c
 perf_kdf_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  -lgcrypt 
+  $(LIBGCRYPT_LIBS) \
+  -lgcrypt
 
 EXTRA_DIST = \
   test_nse.conf \
diff --git a/src/revocation/Makefile.am b/src/revocation/Makefile.am
index 25a171001..18d379b0b 100644
--- a/src/revocation/Makefile.am
+++ b/src/revocation/Makefile.am
@@ -34,6 +34,7 @@ libgnunetrevocation_la_SOURCES = \
   revocation_api.c revocation.h
 libgnunetrevocation_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(LIBGCRYPT_LIBS) \
   $(GN_LIBINTL) $(XLIB) -lgcrypt
 libgnunetrevocation_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
@@ -66,7 +67,7 @@ test_revocation_LDADD = \
  $(top_builddir)/src/testbed/libgnunettestbed.la
 
 check_PROGRAMS = \
- test_revocation 
+ test_revocation
 
 
 check_SCRIPTS = \
diff --git a/src/revocation/gnunet-revocation.c b/src/revocation/gnunet-revocation.c
index 59f47ab97..5bb7965bf 100644
--- a/src/revocation/gnunet-revocation.c
+++ b/src/revocation/gnunet-revocation.c
@@ -90,6 +90,11 @@ static void
 do_shutdown (void *cls,
              const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
+  if (NULL != el)
+  {
+    GNUNET_IDENTITY_ego_lookup_cancel (el);
+    el = NULL;
+  }
   if (NULL != q)
   {
     GNUNET_REVOCATION_query_cancel (q);
diff --git a/src/scalarproduct/Makefile.am b/src/scalarproduct/Makefile.am
index 11a937378..0bdc76e3e 100644
--- a/src/scalarproduct/Makefile.am
+++ b/src/scalarproduct/Makefile.am
@@ -29,6 +29,7 @@ gnunet_scalarproduct_SOURCES = \
 gnunet_scalarproduct_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/scalarproduct/libgnunetscalarproduct.la \
+  $(LIBGCRYPT_LIBS) \
   -lgcrypt \
   $(GN_LIBINTL)
 gnunet_scalarproduct_DEPENDENCIES = \
@@ -40,6 +41,7 @@ gnunet_service_scalarproduct_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/mesh/libgnunetmesh.la \
   $(top_builddir)/src/set/libgnunetset.la \
+  $(LIBGCRYPT_LIBS) \
   -lgcrypt \
   $(GN_LIBINTL)
 
@@ -49,6 +51,7 @@ libgnunetscalarproduct_la_SOURCES = \
 libgnunetscalarproduct_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(LIBGCRYPT_LIBS) \
   -lgcrypt \
   $(LTLIBINTL)
 libgnunetscalarproduct_la_LDFLAGS = \