From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 17 Nov 2010 17:37:23 +0000 (+0000)
Subject: Don't assume a decode error if session tlsext_ecpointformatlist is not NULL: it can... 
X-Git-Tag: OpenSSL-fips-2_0-rc1~945
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7d5686d35519faaab66b0837f0195dabe32925f7;p=oweals%2Fopenssl.git

Don't assume a decode error if session tlsext_ecpointformatlist is not NULL: it can be legitimately set elsewhere.
---

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 9684280d17..cdb55bc276 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -816,8 +816,8 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in
 				{
 				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)