[GNUnet-SVN] r35504 - in libmicrohttpd: . src/include src/testcurl/https

[gnunet]

Author: grothoff
Date: 2015-04-07 00:18:40 +0200 (Tue, 07 Apr 2015)
New Revision: 35504

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/include/microhttpd.h
   libmicrohttpd/src/testcurl/https/test_https_session_info.c
Log:
tolerate TLS 1.1 / 1.2 disagreement

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2015-04-04 16:30:00 UTC (rev 35503)
+++ libmicrohttpd/ChangeLog     2015-04-06 22:18:40 UTC (rev 35504)
@@ -1,3 +1,6 @@
+Tue Apr  7 00:12:36 CEST 2015
+       Releasing libmicrohttpd 0.9.40. -CG
+
 Sat Apr  4 18:28:24 CEST 2015
        Fix potential deadlock issue in MHD_USE_THREAD_PER_CONNECTION
        mode if shutdown is initiated while connections are active. -CG

Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h      2015-04-04 16:30:00 UTC (rev 
35503)
+++ libmicrohttpd/src/include/microhttpd.h      2015-04-06 22:18:40 UTC (rev 
35504)
@@ -1,6 +1,6 @@
 /*
      This file is part of libmicrohttpd
-     Copyright (C) 2006-2014 Christian Grothoff (and other contributing 
authors)
+     Copyright (C) 2006-2015 Christian Grothoff (and other contributing 
authors)
 
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Lesser General Public
@@ -130,7 +130,7 @@
  * Current version of the library.
  * 0x01093001 = 1.9.30-1.
  */
-#define MHD_VERSION 0x00093907
+#define MHD_VERSION 0x00094000
 
 /**
  * MHD-internal return code for "YES".

Modified: libmicrohttpd/src/testcurl/https/test_https_session_info.c
===================================================================
--- libmicrohttpd/src/testcurl/https/test_https_session_info.c  2015-04-04 
16:30:00 UTC (rev 35503)
+++ libmicrohttpd/src/testcurl/https/test_https_session_info.c  2015-04-06 
22:18:40 UTC (rev 35504)
@@ -48,22 +48,34 @@
 {
   struct MHD_Response *response;
   int ret;
-  
+
   if (NULL == *ptr)
     {
       *ptr = &query_session_ahc;
       return MHD_YES;
     }
 
-  if (GNUTLS_TLS1_1 != 
+  if (GNUTLS_TLS1_1 !=
       (ret = MHD_get_connection_info
        (connection,
        MHD_CONNECTION_INFO_PROTOCOL)->protocol))
     {
-      fprintf (stderr, "Error: requested protocol mismatch (wanted %d, got 
%d)\n",
-               GNUTLS_SSL3,
-              ret);
-      return -1;
+      if (GNUTLS_TLS1_2 == ret)
+      {
+        /* as usual, TLS implementations sometimes don't
+           quite do what was asked, just mildly complain... */
+        fprintf (stderr,
+                 "Warning: requested TLS 1.1, got TLS 1.2\n");
+      }
+      else
+      {
+        /* really different version... */
+        fprintf (stderr,
+                 "Error: requested protocol mismatch (wanted %d, got %d)\n",
+                 GNUTLS_TLS1_1,
+                 ret);
+        return -1;
+      }
     }
 
   response = MHD_create_response_from_buffer (strlen (EMPTY_PAGE),