From e61672c6932868d6b09ad0ae8453dc91c545742f Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 17 Oct 2011 15:49:20 +0200
Subject: removed dependency on gcrypt for recently-enough GnuTLS

see: http://bugzilla.adiscon.com/show_bug.cgi?id=289
---
 ChangeLog          | 2 ++
 runtime/nsd_gtls.c | 6 +++++-
 tests/tcpflood.c   | 6 +++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f14971ae..22d194e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 ---------------------------------------------------------------------------
 Version 5.9.4  [V5-DEVEL], 2011-0?-??
+- removed dependency on gcrypt for recently-enough GnuTLS
+  see: http://bugzilla.adiscon.com/show_bug.cgi?id=289
 - bugfix: imuxsock did no longer ignore message-provided timestamp, if
   so configured (the *default*). Lead to no longer sub-second timestamps.
   closes: http://bugzilla.adiscon.com/show_bug.cgi?id=281
diff --git a/runtime/nsd_gtls.c b/runtime/nsd_gtls.c
index ca4b2928..9dda795d 100644
--- a/runtime/nsd_gtls.c
+++ b/runtime/nsd_gtls.c
@@ -29,7 +29,9 @@
 #include <string.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
-#include <gcrypt.h>
+#if GNUTLS_VERSION_NUMBER <= 0x020b00
+#	include <gcrypt.h>
+#endif
 #include <errno.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -563,7 +565,9 @@ gtlsGlblInit(void)
 	DEFiRet;
 
 	/* gcry_control must be called first, so that the thread system is correctly set up */
+	#if GNUTLS_VERSION_NUMBER <= 0x020b00
 	gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+	#endif
 	CHKgnutls(gnutls_global_init());
 	
 	/* X509 stuff */
diff --git a/tests/tcpflood.c b/tests/tcpflood.c
index 8485acbb..8a34f06f 100644
--- a/tests/tcpflood.c
+++ b/tests/tcpflood.c
@@ -91,8 +91,10 @@
 #include <errno.h>
 #ifdef ENABLE_GNUTLS
 #	include <gnutls/gnutls.h>
-#	include <gcrypt.h>
+#	if GNUTLS_VERSION_NUMBER <= 0x020b00
+#		include <gcrypt.h>
 	GCRY_THREAD_OPTION_PTHREAD_IMPL;
+#	endif
 #endif
 
 #define EXIT_FAILURE 1
@@ -707,7 +709,9 @@ initTLS(void)
 	int r;
 
 	/* order of gcry_control and gnutls_global_init matters! */
+	#if GNUTLS_VERSION_NUMBER <= 0x020b00
 	gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+	#endif
 	gnutls_global_init();
 	/* set debug mode, if so required by the options */
 	if(tlsLogLevel > 0) {
-- 
cgit v1.2.3