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

Submitted by: Peter Sylvester <peter.sylvester@edelweb.fr> 

Localize client hello extension parsing in t1_lib.c
parent a4352630

ssl/s3_srvr.c

+2 −7
Original line number Diff line number Diff line
@@ -1177,17 +1177,12 @@ int ssl3_get_client_hello(SSL *s) 
	/* TLS extensions*/

	if (s->version >= SSL3_VERSION)

		{

		if (!ssl_parse_clienthello_tlsext(s,&p,d,n, &al))

		if (!ssl_parse_clienthello_tlsext(s,&p,d,n))

			{

			/* 'al' set by ssl_parse_clienthello_tlsext */

			SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_PARSE_TLSEXT);

			goto f_err;

			}

		}

		if (ssl_check_clienthello_tlsext(s) <= 0) {

			SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_CLIENTHELLO_TLSEXT);

			goto err;

			}

		}



	/* Check if we want to use external pre-shared secret for this

	 * handshake for not reused session only. We need to generate

ssl/ssl_locl.h

+1 −1
Original line number Diff line number Diff line
@@ -1120,7 +1120,7 @@ int tls1_shared_list(SSL *s, 
			int nmatch);

unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned char *limit); 

unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned char *limit); 

int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **data, unsigned char *d, int n, int *al);

int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **data, unsigned char *d, int n);

int ssl_parse_serverhello_tlsext(SSL *s, unsigned char **data, unsigned char *d, int n, int *al);

int ssl_prepare_clienthello_tlsext(SSL *s);

int ssl_prepare_serverhello_tlsext(SSL *s);

ssl/t1_lib.c

+19 −2
Original line number Diff line number Diff line
@@ -1175,7 +1175,7 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned cha 
	return ret;

	}



int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, int n, int *al)

static int ssl_scan_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, int n, int *al) 

	{	

	unsigned short type;

	unsigned short size;
@@ -1669,6 +1669,23 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in 
	return 1;

	}



int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, int n) 

	{

	int al = -1;

	if (ssl_scan_clienthello_tlsext(s, p, d, n, &al) <= 0) 

		{

		ssl3_send_alert(s,SSL3_AL_FATAL,al); 

		return 0;

		}



	if (ssl_check_clienthello_tlsext(s) <= 0) 

		{

		SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_CLIENTHELLO_TLSEXT);

		return 0;

		}

	return 1;

}



#ifndef OPENSSL_NO_NEXTPROTONEG

/* ssl_next_proto_validate validates a Next Protocol Negotiation block. No

 * elements of zero length are allowed and the set of elements must exactly fill