Clear bytes used for block padding of SSL 3.0 records. (CVE-2011-4576)
authorDr. Stephen Henson <steve@openssl.org>
Wed, 4 Jan 2012 18:54:17 +0000 (18:54 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Wed, 4 Jan 2012 18:54:17 +0000 (18:54 +0000)
CHANGES
ssl/s3_enc.c

diff --git a/CHANGES b/CHANGES
index 5e6fcbd..ae0b41c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,10 @@
 
  Changes between 0.9.8r and 0.9.8s [xx XXX xxxx]
 
+  *) Clear bytes used for block padding of SSL 3.0 records.
+     (CVE-2011-4576)
+     [Adam Langley (Google)]
+
   *) Only allow one SGC handshake restart for SSL/TLS. (CVE-2011-4619)
      [Adam Langley (Google)]
  
index 1539a4c..759231d 100644 (file)
@@ -479,6 +479,9 @@ int ssl3_enc(SSL *s, int send)
 
                        /* we need to add 'i-1' padding bytes */
                        l+=i;
+                       /* the last of these zero bytes will be overwritten
+                        * with the padding length. */
+                       memset(&rec->input[rec->length], 0, i);
                        rec->length+=i;
                        rec->input[l-1]=(i-1);
                        }