Module Name: src
Committed By: riz
Date: Wed Jan 25 20:34:41 UTC 2012
Modified Files:
src/crypto/dist/openssl/ssl [netbsd-5-1]: s3_enc.c
Log Message:
Apply patch (requested by drochner in ticket #1713):
crypto/dist/openssl/ssl/s3_enc.c patch
Address CVE-2011-4576.
[drochner, ticket #1713]
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.12.4.1 -r1.1.1.12.4.1.2.1 \
src/crypto/dist/openssl/ssl/s3_enc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/openssl/ssl/s3_enc.c
diff -u src/crypto/dist/openssl/ssl/s3_enc.c:1.1.1.12.4.1 src/crypto/dist/openssl/ssl/s3_enc.c:1.1.1.12.4.1.2.1
--- src/crypto/dist/openssl/ssl/s3_enc.c:1.1.1.12.4.1 Mon Apr 12 00:40:12 2010
+++ src/crypto/dist/openssl/ssl/s3_enc.c Wed Jan 25 20:34:41 2012
@@ -504,6 +504,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);
}
