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 48ea25397a1f0e6e3052243dbeb4421243c317df..c21421fe5571650e715aeeaafda64366ca70887a 100644 (file)
--- 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 */