provide less timing information when decoding packets. Patch by Nadhem Alfardan.

diff --git a/NEWS b/NEWS
index 58b6a818ddbabd374966bf23fec18b9cd4a7f95b..49372ad56dc10cae54c358e150e5e8c4194f5e47 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,15 @@ GnuTLS NEWS -- History of user-visible changes.                -*- outline -*-
 Copyright (C) 2000-2011 Free Software Foundation, Inc.
 See the end for copying conditions.
 
+* Version 3.0.11 (unreleased)
+
+** libgnutls: Provide less timing information when decoding
+TLS/DTLS record packets. Patch by Nadhem Alfardan.
+
+** API and ABI modifications:
+No changes since last version.
+
+
 * Version 3.0.10 (released 2012-01-04)
 
 ** gnutls-cli/serv: Set don't fragment bit in DTLS sessions

diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c
index f04182189bacf0dbbf3bb897b122f3fd77360399..e593cfe919af4fb4ad6810aa8efd4d31b32f162f 100644 (file)
--- a/lib/gnutls_cipher.c
+++ b/lib/gnutls_cipher.c
@@ -560,7 +560,12 @@ ciphertext_to_compressed (gnutls_session_t session,
           }
 
       if (length < 0)
-        length = 0;
+        {
+          /* Setting a proper length to prevent timing differences in
+           * processing of records with invalid encryption.
+           */
+          length = ciphertext.size - tag_size;
+        }
 
       /* Pass the type, version, length and compressed through
        * MAC.