Commit 8b6205c4 authored by Matt Caswell's avatar Matt Caswell
Browse files

Added OPENSSL_NO_EC2M guards around the preferred EC curve list 



Reviewed-by: default avatarDr. Stephen Henson <steve@openssl.org>
parent e5cf62b0

ssl/t1_lib.c

+15 −8
Original line number Diff line number Diff line
@@ -204,28 +204,40 @@ static int nid_list[] = 


static int pref_list[] =

	{

#ifndef OPENSSL_NO_EC2M

		NID_sect571r1, /* sect571r1 (14) */ 

		NID_sect571k1, /* sect571k1 (13) */ 

#endif

		NID_secp521r1, /* secp521r1 (25) */	

#ifndef OPENSSL_NO_EC2M

		NID_sect409k1, /* sect409k1 (11) */ 

		NID_sect409r1, /* sect409r1 (12) */

#endif

		NID_secp384r1, /* secp384r1 (24) */

#ifndef OPENSSL_NO_EC2M

		NID_sect283k1, /* sect283k1 (9) */

		NID_sect283r1, /* sect283r1 (10) */ 

#endif

		NID_secp256k1, /* secp256k1 (22) */ 

		NID_X9_62_prime256v1, /* secp256r1 (23) */ 

#ifndef OPENSSL_NO_EC2M

		NID_sect239k1, /* sect239k1 (8) */ 

		NID_sect233k1, /* sect233k1 (6) */

		NID_sect233r1, /* sect233r1 (7) */ 

#endif

		NID_secp224k1, /* secp224k1 (20) */ 

		NID_secp224r1, /* secp224r1 (21) */

#ifndef OPENSSL_NO_EC2M

		NID_sect193r1, /* sect193r1 (4) */ 

		NID_sect193r2, /* sect193r2 (5) */ 

#endif

		NID_secp192k1, /* secp192k1 (18) */

		NID_X9_62_prime192v1, /* secp192r1 (19) */ 

#ifndef OPENSSL_NO_EC2M

		NID_sect163k1, /* sect163k1 (1) */

		NID_sect163r1, /* sect163r1 (2) */

		NID_sect163r2, /* sect163r2 (3) */

#endif

		NID_secp160k1, /* secp160k1 (15) */

		NID_secp160r1, /* secp160r1 (16) */ 

		NID_secp160r2, /* secp160r2 (17) */
@@ -233,7 +245,7 @@ static int pref_list[] = 


int tls1_ec_curve_id2nid(int curve_id)

	{

	/* ECC curves from draft-ietf-tls-ecc-12.txt (Oct. 17, 2005) */

	/* ECC curves from RFC 4492 */

	if ((curve_id < 1) || ((unsigned int)curve_id >

				sizeof(nid_list)/sizeof(nid_list[0])))

		return 0;
@@ -242,7 +254,7 @@ int tls1_ec_curve_id2nid(int curve_id) 


int tls1_ec_nid2curve_id(int nid)

	{

	/* ECC curves from draft-ietf-tls-ecc-12.txt (Oct. 17, 2005) */

	/* ECC curves from RFC 4492 */

	switch (nid)

		{

	case NID_sect163k1: /* sect163k1 (1) */
@@ -488,11 +500,6 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *buf, unsigned c 
		s2n(TLSEXT_TYPE_elliptic_curves,ret);

		s2n(s->tlsext_ellipticcurvelist_length + 2, ret);



		/* NB: draft-ietf-tls-ecc-12.txt uses a one-byte prefix for

		 * elliptic_curve_list, but the examples use two bytes.

		 * http://www1.ietf.org/mail-archive/web/tls/current/msg00538.html

		 * resolves this to two bytes.

		 */

		s2n(s->tlsext_ellipticcurvelist_length, ret);

		memcpy(ret, s->tlsext_ellipticcurvelist, s->tlsext_ellipticcurvelist_length);

		ret+=s->tlsext_ellipticcurvelist_length;
@@ -1800,7 +1807,7 @@ int ssl_prepare_clienthello_tlsext(SSL *s) 
		s->tlsext_ecpointformatlist[1] = TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime;

		s->tlsext_ecpointformatlist[2] = TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2;



		/* we support all named elliptic curves in draft-ietf-tls-ecc-12 */

		/* we support all named elliptic curves in RFC 4492 */

		if (s->tlsext_ellipticcurvelist != NULL) OPENSSL_free(s->tlsext_ellipticcurvelist);

		s->tlsext_ellipticcurvelist_length = sizeof(pref_list)/sizeof(pref_list[0]) * 2;

		if ((s->tlsext_ellipticcurvelist = OPENSSL_malloc(s->tlsext_ellipticcurvelist_length)) == NULL)