[Emacs-diffs] emacs-26 d4fa83b: Fix GnuTLS test suite with GnuTLS versions 3.4.x

[Eli Zaretskii]

branch: emacs-26
commit d4fa83baf5462cfcf61ebbb8c0a0ec584d11c39a
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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 d0869ae..9e105b9 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -38,8 +38,8 @@ along with GNU Emacs.  If not, see 
<https://www.gnu.org/licenses/>.  */
    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