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

[gnunet]

Author: Karlson2k
Date: 2015-05-07 20:20:38 +0200 (Thu, 07 May 2015)
New Revision: 35727

Modified:
   libmicrohttpd/src/microhttpd/daemon.c
Log:
fix: gnutls_certificate_set_x509_key_mem2 was actually added in GnuTLS 3.1.11

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2015-05-07 17:09:29 UTC (rev 
35726)
+++ libmicrohttpd/src/microhttpd/daemon.c       2015-05-07 18:20:38 UTC (rev 
35727)
@@ -547,7 +547,7 @@
       cert.size = strlen (daemon->https_mem_cert);
 
       if (NULL != daemon->https_key_password) {
-#if GNUTLS_VERSION_NUMBER >= 0x030100
+#if GNUTLS_VERSION_NUMBER >= 0x030111
         ret = gnutls_certificate_set_x509_key_mem2 (daemon->x509_cred,
                                                     &cert, &key,
                                                     GNUTLS_X509_FMT_PEM,
@@ -4745,7 +4745,7 @@
       return MHD_NO;
 #endif
     case MHD_FEATURE_HTTPS_KEY_PASSWORD:
-#if HTTPS_SUPPORT && GNUTLS_VERSION_NUMBER >= 0x030100
+#if HTTPS_SUPPORT && GNUTLS_VERSION_NUMBER >= 0x030111
       return MHD_YES;
 #else
       return MHD_NO;