diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-08-03 17:57:24 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-08-03 18:36:15 -0700 |
| commit | e8ca0c5e16a6887691ee3db739abfdba25e0d578 (patch) | |
| tree | cee63ad775d7996718a745a46e646d591a02eaa1 /src/gnutls.h | |
| parent | ddc1ff58dec92a782b233d97a254fc41c1c887eb (diff) | |
| download | emacs-e8ca0c5e16a6887691ee3db739abfdba25e0d578.tar.gz | |
Fix version numbers for some GnuTLS features
Problem reported by Glenn Morris (Bug#27708#58).
* src/gnutls.c (HAVE_GNUTLS_X509_SYSTEM_TRUST):
New macro. Use it instead of low-level version number checks.
(HAVE_GNUTLS_AEAD): Move here from gnutls.h, and rename from
HAVE_GNUTLS3_AEAD. All uses changed. Indent preprocessor lines.
* src/gnutls.h (HAVE_GNUTLS3_CIPHER, HAVE_GNUTLS3_DIGEST)
(HAVE_GNUTLS3_HMAC): Remove, since these were available
before GnuTLS 3.0.0 and the code checks them only if HAVE_GNUTLS3
is defined. Remove all uses; this simplifies the code a bit.
Diffstat (limited to 'src/gnutls.h')
| -rw-r--r-- | src/gnutls.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/gnutls.h b/src/gnutls.h index 8fe4ac3e427..9323cd1aeff 100644 --- a/src/gnutls.h +++ b/src/gnutls.h @@ -28,22 +28,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ # include <gnutls/crypto.h> #endif -#if 0x030400 <= GNUTLS_VERSION_NUMBER -# define HAVE_GNUTLS3_CIPHER -# define HAVE_GNUTLS3_DIGEST -# define HAVE_GNUTLS3_HMAC -#endif - -/* Although AEAD support started in GnuTLS 3.4.0 and works in 3.5.14, - it was broken through at least GnuTLS 3.4.10; see: - https://lists.gnu.org/archive/html/emacs-devel/2017-07/msg00992.html - The relevant fix seems to have been made in GnuTLS 3.5.1; see: - https://gitlab.com/gnutls/gnutls/commit/568935848dd6b82b9315d8b6c529d00e2605e03d - So use 3.5.1 for now. */ -#if 0x030501 <= GNUTLS_VERSION_NUMBER -# define HAVE_GNUTLS3_AEAD -#endif - #include "lisp.h" /* This limits the attempts to handshake per process (connection). It |