From d4fa83baf5462cfcf61ebbb8c0a0ec584d11c39a Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 18 Sep 2018 13:24:29 +0300 Subject: [PATCH] Fix GnuTLS test suite with GnuTLS versions 3.4.x * src/gnutls.c (gnutls_cipher_get_tag_size): Make it return zero only for versions of GnuTLS < 3.2.2, where gnutls_cipher_get_tag_size was introduced. This fixes the GnuTLS test suite, which assumes that any cipher whose tag size is non-zero is AEAD-capable, and doesn't test such ciphers if AEAD is not available, i.e. for GnuTLS < 3.5.1. (Bug#32446) --- src/gnutls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gnutls.c b/src/gnutls.c index d0869ae9015..9e105b948f0 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -38,8 +38,8 @@ along with GNU Emacs. If not, see . */ So, require 3.5.1. */ #if GNUTLS_VERSION_NUMBER >= 0x030501 # define HAVE_GNUTLS_AEAD -#else -/* gnutls_cipher_get_tag_size was introduced in 3.2.0, but it's only +#elif GNUTLS_VERSION_NUMBER < 0x030202 +/* gnutls_cipher_get_tag_size was introduced in 3.2.2, but it's only relevant for AEAD ciphers. */ # define gnutls_cipher_get_tag_size(cipher) 0 #endif -- 2.39.2