diff options
| author | Ted Zlatanov | 2017-12-20 20:12:42 -0500 |
|---|---|---|
| committer | Ted Zlatanov | 2017-12-20 20:12:42 -0500 |
| commit | b3f4a3a5aee93fa2f7ad2597383befbf7b242209 (patch) | |
| tree | 4d23f7c05565f9d5bad946574f4a088616a39247 /src/gnutls.c | |
| parent | c2ae057d0e455ed40127fec931b803ff628bffb7 (diff) | |
| download | emacs-b3f4a3a5aee93fa2f7ad2597383befbf7b242209.tar.gz emacs-b3f4a3a5aee93fa2f7ad2597383befbf7b242209.zip | |
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.
Diffstat (limited to 'src/gnutls.c')
| -rw-r--r-- | src/gnutls.c | 8 |
1 files changed, 8 insertions, 0 deletions
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/>. */ | |||
| 50 | # define HAVE_GNUTLS_EXT_GET_NAME | 50 | # define HAVE_GNUTLS_EXT_GET_NAME |
| 51 | #endif | 51 | #endif |
| 52 | 52 | ||
| 53 | #if GNUTLS_VERSION_NUMBER >= 0x030205 | ||
| 54 | # define HAVE_GNUTLS_EXT__DUMBFW | ||
| 55 | #endif | ||
| 56 | |||
| 53 | #ifdef HAVE_GNUTLS | 57 | #ifdef HAVE_GNUTLS |
| 54 | 58 | ||
| 55 | # ifdef WINDOWSNT | 59 | # ifdef WINDOWSNT |
| @@ -2476,6 +2480,10 @@ Any GnuTLS extension with ID up to 100 | |||
| 2476 | # endif | 2480 | # endif |
| 2477 | # endif /* HAVE_GNUTLS3 */ | 2481 | # endif /* HAVE_GNUTLS3 */ |
| 2478 | 2482 | ||
| 2483 | # ifdef HAVE_GNUTLS_EXT__DUMBFW | ||
| 2484 | capabilities = Fcons (intern("ClientHello Padding"), capabilities); | ||
| 2485 | # endif | ||
| 2486 | |||
| 2479 | # ifdef WINDOWSNT | 2487 | # ifdef WINDOWSNT |
| 2480 | Vlibrary_cache = Fcons (Fcons (Qgnutls, capabilities), Vlibrary_cache); | 2488 | Vlibrary_cache = Fcons (Fcons (Qgnutls, capabilities), Vlibrary_cache); |
| 2481 | # endif /* WINDOWSNT */ | 2489 | # endif /* WINDOWSNT */ |