From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 26 Dec 2012 18:26:11 +0000 (+0000)
Subject: Reject zero length ec point format list.
X-Git-Tag: OpenSSL_1_0_2-beta1~485
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a08f8d73ccac52dfd6e674f2d5abbe70986c7fc8;p=oweals%2Fopenssl.git

Reject zero length ec point format list.

Give more meaningful error is attempt made to use incorrect curve.

(from HEAD)
---

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 984d4bbf7a..04385f6c64 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -885,7 +885,10 @@ int tls12_check_peer_sigalg(const EVP_MD **pmd, SSL *s,
 		if (!tls1_set_ec_id(curve_id, &comp_id, pkey->pkey.ec))
 			return 0;
 		if (!s->server && !tls1_check_ec_key(s, curve_id, &comp_id))
+			{
+			SSLerr(SSL_F_TLS12_CHECK_PEER_SIGALG,SSL_R_WRONG_CURVE);
 			return 0;
+			}
 		/* If Suite B only P-384+SHA384 or P-256+SHA-256 allowed */
 		if (tls1_suiteb(s))
 			{
@@ -1863,7 +1866,8 @@ static int ssl_scan_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char
 			unsigned char *sdata = data;
 			int ecpointformatlist_length = *(sdata++);
 
-			if (ecpointformatlist_length != size - 1)
+			if (ecpointformatlist_length != size - 1 || 
+				ecpointformatlist_length < 1)
 				{
 				*al = TLS1_AD_DECODE_ERROR;
 				return 0;
@@ -2344,8 +2348,7 @@ static int ssl_scan_serverhello_tlsext(SSL *s, unsigned char **p, unsigned char
 			unsigned char *sdata = data;
 			int ecpointformatlist_length = *(sdata++);
 
-			if (ecpointformatlist_length != size - 1 || 
-				ecpointformatlist_length < 1)
+			if (ecpointformatlist_length != size - 1)
 				{
 				*al = TLS1_AD_DECODE_ERROR;
 				return 0;