From: Ted Zlatanov <tzz@lifelogs.com>
Date: Thu, 21 Dec 2017 01:12:42 +0000 (-0500)
Subject: Special-case %DUMBFW for GnuTLS between 3.2.5 and 3.5.1
X-Git-Tag: emacs-26.0.91~100
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b3f4a3a5aee93fa2f7ad2597383befbf7b242209;p=emacs.git

Special-case %DUMBFW for GnuTLS between 3.2.5 and 3.5.1

* src/gnutls.c: Introduce HAVE_GNUTLS_EXT__DUMBFW for GnuTLS >= 3.2.5.
(Fgnutls_available_p): Use it.
---

diff --git a/src/gnutls.c b/src/gnutls.c
index 48ea25397a1..c21421fe557 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -50,6 +50,10 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 # define HAVE_GNUTLS_EXT_GET_NAME
 #endif
 
+#if GNUTLS_VERSION_NUMBER >= 0x030205
+# define HAVE_GNUTLS_EXT__DUMBFW
+#endif
+
 #ifdef HAVE_GNUTLS
 
 # ifdef WINDOWSNT
@@ -2476,6 +2480,10 @@ Any GnuTLS extension with ID up to 100
 #  endif
 # endif	  /* HAVE_GNUTLS3 */
 
+#  ifdef HAVE_GNUTLS_EXT__DUMBFW
+  capabilities = Fcons (intern("ClientHello Padding"), capabilities);
+#  endif
+
 # ifdef WINDOWSNT
   Vlibrary_cache = Fcons (Fcons (Qgnutls, capabilities), Vlibrary_cache);
 # endif /* WINDOWSNT */