Changeset 0499540 in mod_gnutls

Timestamp:

Jun 30, 2010, 2:16:35 PM (9 years ago)

Author:

Nikos Mavrogiannopoulos <nmav@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, msva, upstream

Children:

f10ab4f

Parents:

4deda6d

Message:

Use libgcrypt calls only if gnutls is older than 2.11.0

Files:

• include/mod_gnutls.h.in (modified) (1 diff)
• src/gnutls_hooks.c (modified) (2 diffs)

include/mod_gnutls.h.in

@@ -28 +28 @@
 #include "ap_release.h"
 
-#include <gcrypt.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/extra.h>

src/gnutls_hooks.c

@@ -21 +21 @@
 #include "ap_mpm.h"
 
+#if GNUTLS_VERSION_MAJOR <= 2 && GNUTLS_VERSION_MINOR < 11
+#include <gcrypt.h>
+#endif
+
 #if !USING_2_1_RECENT
 extern server_rec *ap_server_conf;
@@ -84 +88 @@
 #if APR_HAS_THREADS
     ap_mpm_query(AP_MPMQ_IS_THREADED, &mpm_is_threaded);
+#if (GNUTLS_VERSION_MAJOR == 2 && GNUTLS_VERSION_MINOR < 11) || GNUTLS_VERSION_MAJOR < 2
     if (mpm_is_threaded) {
         gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
     }
+#endif
 #else
     mpm_is_threaded = 0;
 #endif
+
 
     if (gnutls_check_version(LIBGNUTLS_VERSION)==NULL) {