Changeset 0499540 in mod_gnutls


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • include/mod_gnutls.h.in

    r4deda6d r0499540  
    2828#include "ap_release.h"
    2929
    30 #include <gcrypt.h>
    3130#include <gnutls/gnutls.h>
    3231#include <gnutls/extra.h>
  • src/gnutls_hooks.c

    r4deda6d r0499540  
    2121#include "ap_mpm.h"
    2222
     23#if GNUTLS_VERSION_MAJOR <= 2 && GNUTLS_VERSION_MINOR < 11
     24#include <gcrypt.h>
     25#endif
     26
    2327#if !USING_2_1_RECENT
    2428extern server_rec *ap_server_conf;
     
    8488#if APR_HAS_THREADS
    8589    ap_mpm_query(AP_MPMQ_IS_THREADED, &mpm_is_threaded);
     90#if (GNUTLS_VERSION_MAJOR == 2 && GNUTLS_VERSION_MINOR < 11) || GNUTLS_VERSION_MAJOR < 2
    8691    if (mpm_is_threaded) {
    8792        gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
    8893    }
     94#endif
    8995#else
    9096    mpm_is_threaded = 0;
    9197#endif
     98
    9299
    93100    if (gnutls_check_version(LIBGNUTLS_VERSION)==NULL) {
Note: See TracChangeset for help on using the changeset viewer.