[GNUnet-SVN] r35496 - in libmicrohttpd/src: include microhttpd

[gnunet]

Author: Karlson2k
Date: 2015-04-03 15:03:19 +0200 (Fri, 03 Apr 2015)
New Revision: 35496

Modified:
   libmicrohttpd/src/include/microhttpd.h
   libmicrohttpd/src/microhttpd/daemon.c
Log:
Add MHD_FEATURE_HTTPS_KEY_PASSWORD

Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h      2015-04-03 11:28:21 UTC (rev 
35495)
+++ libmicrohttpd/src/include/microhttpd.h      2015-04-03 13:03:19 UTC (rev 
35496)
@@ -130,7 +130,7 @@
  * Current version of the library.
  * 0x01093001 = 1.9.30-1.
  */
-#define MHD_VERSION 0x00093905
+#define MHD_VERSION 0x00093906
 
 /**
  * MHD-internal return code for "YES".
@@ -870,6 +870,7 @@
    * to be used by the HTTPS daemon. This option should be followed by a
    * `const char *` argument.
    * This should be used in conjunction with #MHD_OPTION_HTTPS_MEM_KEY.
+   * @sa ::MHD_FEATURE_HTTPS_KEY_PASSWORD
    */
   MHD_OPTION_HTTPS_KEY_PASSWORD = 26,
 
@@ -2638,7 +2639,14 @@
    * #MHD_destroy_post_processor() can
    * be used.
    */
-  MHD_FEATURE_POSTPROCESSOR = 13
+  MHD_FEATURE_POSTPROCESSOR = 13,
+
+  /**
+  * Get whether password encrypted private key for HTTPS daemon is
+  * supported. If supported then option 
+  * ::MHD_OPTION_HTTPS_KEY_PASSWORD can be used.
+  */
+  MHD_FEATURE_HTTPS_KEY_PASSWORD = 14
 };
 
 

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2015-04-03 11:28:21 UTC (rev 
35495)
+++ libmicrohttpd/src/microhttpd/daemon.c       2015-04-03 13:03:19 UTC (rev 
35496)
@@ -4634,6 +4634,12 @@
 #else
       return MHD_NO;
 #endif
+    case MHD_FEATURE_HTTPS_KEY_PASSWORD:
+#if HTTPS_SUPPORT && GNUTLS_VERSION_NUMBER >= 0x030100
+      return MHD_YES;
+#else
+      return MHD_NO;
+#endif
     }
   return MHD_NO;
 }