Commit d18b716d authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

check EC tmp key matches preferences

parent 1e4cb467

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 


 Changes between 1.0.1 and 1.1.0  [xx XXX xxxx]



  *) If server EC tmp key is not in client preference list abort handshake.

     [Steve Henson]



  *) Add support for certificate stores in CERT structure. This makes it

     possible to have different stores per SSL structure or one store in

     the parent SSL_CTX. Include distint stores for certificate chain

ssl/s3_clnt.c

+11 −3
Original line number Diff line number Diff line
@@ -1647,9 +1647,17 @@ int ssl3_get_key_exchange(SSL *s) 
		 * and the ECParameters in this case is just three bytes.

		 */

		param_len=3;

		if ((param_len > n) ||

		    (*p != NAMED_CURVE_TYPE) || 

		    ((curve_nid = tls1_ec_curve_id2nid(*(p + 2))) == 0)) 

		/* Check curve is one of our prefrences, if not server has

		 * sent an invalid curve.

		 */

		if (!tls1_check_curve(s, p, param_len))

			{

			al=SSL_AD_DECODE_ERROR;

			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_WRONG_CURVE);

			goto f_err;

			}



		if ((curve_nid = tls1_ec_curve_id2nid(*(p + 2))) == 0) 

			{

			al=SSL_AD_INTERNAL_ERROR;

			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS);

ssl/ssl.h

+1 −0
Original line number Diff line number Diff line
@@ -2764,6 +2764,7 @@ void ERR_load_SSL_strings(void); 
#define SSL_R_USE_SRTP_NOT_NEGOTIATED			 369

#define SSL_R_WRITE_BIO_NOT_SET				 260

#define SSL_R_WRONG_CIPHER_RETURNED			 261

#define SSL_R_WRONG_CURVE				 378

#define SSL_R_WRONG_MESSAGE_TYPE			 262

#define SSL_R_WRONG_NUMBER_OF_KEY_BITS			 263

#define SSL_R_WRONG_SIGNATURE_LENGTH			 264

ssl/ssl_err.c

+1 −0
Original line number Diff line number Diff line
@@ -603,6 +603,7 @@ static ERR_STRING_DATA SSL_str_reasons[]= 
{ERR_REASON(SSL_R_USE_SRTP_NOT_NEGOTIATED),"use srtp not negotiated"},

{ERR_REASON(SSL_R_WRITE_BIO_NOT_SET)     ,"write bio not set"},

{ERR_REASON(SSL_R_WRONG_CIPHER_RETURNED) ,"wrong cipher returned"},

{ERR_REASON(SSL_R_WRONG_CURVE)           ,"wrong curve"},

{ERR_REASON(SSL_R_WRONG_MESSAGE_TYPE)    ,"wrong message type"},

{ERR_REASON(SSL_R_WRONG_NUMBER_OF_KEY_BITS),"wrong number of key bits"},

{ERR_REASON(SSL_R_WRONG_SIGNATURE_LENGTH),"wrong signature length"},

ssl/ssl_locl.h

+1 −0
Original line number Diff line number Diff line
@@ -1186,6 +1186,7 @@ SSL_COMP *ssl3_comp_find(STACK_OF(SSL_COMP) *sk, int n); 
#ifndef OPENSSL_NO_EC

int tls1_ec_curve_id2nid(int curve_id);

int tls1_ec_nid2curve_id(int nid);

int tls1_check_curve(SSL *s, const unsigned char *p, size_t len);

int tls1_shared_curve(SSL *s, int nmatch);

int tls1_set_curves(unsigned char **pext, size_t *pextlen,

			int *curves, size_t ncurves);