From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 9 Jan 2023 20:05:40 +0000 (+0200)
Subject: Remove unneeded restriction in using AEAD ciphers with GnuTLS
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5259f144d95d92dbda3d8db06b4f870bcfbb4a93;p=emacs.git

Remove unneeded restriction in using AEAD ciphers with GnuTLS

* src/gnutls.c (gnutls_symmetric_aead): Disable the enforcement of
block size on input data.  (Bug#60693)
---

diff --git a/src/gnutls.c b/src/gnutls.c
index e8528381efd..ca7e9fc4c73 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -2405,6 +2405,9 @@ gnutls_symmetric_aead (bool encrypting, gnutls_cipher_algorithm_t gca,
       aead_auth_size = aend_byte - astart_byte;
     }
 
+  /* Only block ciphers require that ISIZE be a multiple of the block
+     size, and AEAD ciphers are not block ciphers.  */
+#if 0
   ptrdiff_t expected_remainder = encrypting ? 0 : cipher_tag_size;
   ptrdiff_t cipher_block_size = gnutls_cipher_get_block_size (gca);
 
@@ -2414,6 +2417,7 @@ gnutls_symmetric_aead (bool encrypting, gnutls_cipher_algorithm_t gca,
 	    "is not %"pD"d greater than a multiple of the required %"pD"d"),
            gnutls_cipher_get_name (gca), desc,
 	   isize, expected_remainder, cipher_block_size);
+#endif
 
   ret = ((encrypting ? gnutls_aead_cipher_encrypt : gnutls_aead_cipher_decrypt)
 	 (acipher, vdata, vsize, aead_auth_data, aead_auth_size,