Module Name: src
Committed By: bouyer
Date: Fri Dec 10 21:44:25 UTC 2010
Modified Files:
src/crypto/dist/openssl/ssl [netbsd-5-1]: t1_lib.c
Log Message:
Pull up following revision(s) (requested by drochner in ticket #1510):
crypto/external/bsd/openssl/dist/ssl/t1_lib.c: revision 1.3 via patch
fix bug introduced by last security patch, from upstream CVS:
Don't assume a decode error if session tlsext_ecpointformatlist is
not NULL: it can be legitimately set elsewhere.
To generate a diff of this commit:
cvs rdiff -u -r1.2.12.1 -r1.2.12.2 src/crypto/dist/openssl/ssl/t1_lib.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/t1_lib.c
diff -u src/crypto/dist/openssl/ssl/t1_lib.c:1.2.12.1 src/crypto/dist/openssl/ssl/t1_lib.c:1.2.12.2
--- src/crypto/dist/openssl/ssl/t1_lib.c:1.2.12.1 Fri Nov 19 21:29:26 2010
+++ src/crypto/dist/openssl/ssl/t1_lib.c Fri Dec 10 21:44:25 2010
@@ -689,8 +689,8 @@
{
if(s->session->tlsext_ecpointformatlist)
{
- *al = TLS1_AD_DECODE_ERROR;
- return 0;
+ OPENSSL_free(s->session->tlsext_ecpointformatlist);
+ s->session->tlsext_ecpointformatlist = NULL;
}
s->session->tlsext_ecpointformatlist_length = 0;
if ((s->session->tlsext_ecpointformatlist = OPENSSL_malloc(ecpointformatlist_length)) == NULL)
