[GNUnet-SVN] r29480 - libmicrohttpd/src/testcurl

[gnunet]

Author: grothoff
Date: 2013-09-23 13:39:05 +0200 (Mon, 23 Sep 2013)
New Revision: 29480

Modified:
   libmicrohttpd/src/testcurl/Makefile.am
   libmicrohttpd/src/testcurl/test_postform.c
Log:
-need to initialize gcrypt for libcurl

Modified: libmicrohttpd/src/testcurl/Makefile.am
===================================================================
--- libmicrohttpd/src/testcurl/Makefile.am      2013-09-23 11:23:37 UTC (rev 
29479)
+++ libmicrohttpd/src/testcurl/Makefile.am      2013-09-23 11:39:05 UTC (rev 
29480)
@@ -186,7 +186,7 @@
   test_postform.c
 test_postform_LDADD = \
   $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@ 
+  @LIBCURL@  @LIBGCRYPT_LIBS@
 
 test_post_loop_SOURCES = \
   test_post_loop.c
@@ -228,7 +228,7 @@
   test_postform.c
 test_postform11_LDADD = \
   $(top_builddir)/src/microhttpd/libmicrohttpd.la \
-  @LIBCURL@ 
+  @LIBCURL@  @LIBGCRYPT_LIBS@
 
 test_post_loop11_SOURCES = \
   test_post_loop.c

Modified: libmicrohttpd/src/testcurl/test_postform.c
===================================================================
--- libmicrohttpd/src/testcurl/test_postform.c  2013-09-23 11:23:37 UTC (rev 
29479)
+++ libmicrohttpd/src/testcurl/test_postform.c  2013-09-23 11:39:05 UTC (rev 
29480)
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <gcrypt.h>
 
 #ifndef WINDOWS
 #include <unistd.h>
@@ -468,6 +469,11 @@
 {
   unsigned int errorCount = 0;
 
+  gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
+  gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+#ifdef GCRYCTL_INITIALIZATION_FINISHED
+  gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
+#endif
   oneone = NULL != strstr (argv[0], "11");
   if (0 != curl_global_init (CURL_GLOBAL_WIN32))
     return 2;