From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Thu, 10 Mar 2011 23:15:55 +0000 (+0100)
Subject: Corrected size check in block encrypted records.
X-Git-Tag: gnutls_2_99_0~146
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ab04f58304603c5c5f2d69e8e51cd378d75e8a7;p=thirdparty%2Fgnutls.git

Corrected size check in block encrypted records.
---

diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c
index d3551519d0..deef202948 100644
--- a/lib/gnutls_cipher.c
+++ b/lib/gnutls_cipher.c
@@ -519,7 +519,7 @@ _gnutls_ciphertext2compressed (gnutls_session_t session,
 
       break;
     case CIPHER_BLOCK:
-      if ((ciphertext.size < blocksize+tag_size) || (ciphertext.size % blocksize != 0))
+      if (ciphertext.size < MAX(blocksize, tag_size) || (ciphertext.size % blocksize != 0))
         return gnutls_assert_val(GNUTLS_E_UNEXPECTED_PACKET_LENGTH);
 
       /* ignore the IV in TLS 1.1+