[GNUnet-SVN] r32896 - libmicrohttpd/src/microhttpd

[gnunet]

Author: Karlson2k
Date: 2014-04-04 19:02:43 +0200 (Fri, 04 Apr 2014)
New Revision: 32896

Modified:
   libmicrohttpd/src/microhttpd/daemon.c
Log:
Check result of initialisaion of libgcrypt, runtime check for required 
libgcrypt version

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2014-04-04 15:02:07 UTC (rev 
32895)
+++ libmicrohttpd/src/microhttpd/daemon.c       2014-04-04 17:02:43 UTC (rev 
32896)
@@ -4365,9 +4365,13 @@
 #endif
 #if HTTPS_SUPPORT
 #if GCRYPT_VERSION_NUMBER < 0x010600
-  gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+  if (!gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread))
+    MHD_PANIC ("Failed to initialise multithreading in libgcrypt\n");
+  gcry_check_version (NULL);
+#else
+  if (NULL == gcry_check_version ("1.6.0"))
+    MHD_PANIC ("libgcrypt is too old. MHD was compiled for libgcrypt 1.6.0 or 
newer\n");
 #endif
-  gcry_check_version (NULL);
   gnutls_global_init ();
 #endif
 }