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

Backport TLS v1.1 support from HEAD, ssl/ changes

parent 1eb1cf45

ssl/s23_clnt.c

+20 −3
Changes for ssl/s23_clnt.c: 20 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -129,6 +129,8 @@ static const SSL_METHOD *ssl23_get_client_method(int ver) 
		return(SSLv3_client_method());

	else if (ver == TLS1_VERSION)

		return(TLSv1_client_method());

	else if (ver == TLS1_1_VERSION)

		return(TLSv1_1_client_method());

	else

		return(NULL);

	}
@@ -284,7 +286,11 @@ static int ssl23_client_hello(SSL *s) 
	if (ssl2_compat && ssl23_no_ssl2_ciphers(s))

		ssl2_compat = 0;



	if (!(s->options & SSL_OP_NO_TLSv1))

	if (!(s->options & SSL_OP_NO_TLSv1_1))

		{

		version = TLS1_1_VERSION;

		}

	else if (!(s->options & SSL_OP_NO_TLSv1))

		{

		version = TLS1_VERSION;

		}
@@ -329,7 +335,12 @@ static int ssl23_client_hello(SSL *s) 
		if (RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0)

			return -1;



		if (version == TLS1_VERSION)

		if (version == TLS1_1_VERSION)

			{

			version_major = TLS1_1_VERSION_MAJOR;

			version_minor = TLS1_1_VERSION_MINOR;

			}

		else if (version == TLS1_VERSION)

			{

			version_major = TLS1_VERSION_MAJOR;

			version_minor = TLS1_VERSION_MINOR;
@@ -608,7 +619,7 @@ static int ssl23_get_server_hello(SSL *s) 
#endif

		}

	else if (p[1] == SSL3_VERSION_MAJOR &&

	         (p[2] == SSL3_VERSION_MINOR || p[2] == TLS1_VERSION_MINOR) &&

	         (p[2] >= SSL3_VERSION_MINOR && p[2] <= TLS1_1_VERSION_MINOR) &&

	         ((p[0] == SSL3_RT_HANDSHAKE && p[5] == SSL3_MT_SERVER_HELLO) ||

	          (p[0] == SSL3_RT_ALERT && p[3] == 0 && p[4] == 2)))

		{
@@ -626,6 +637,12 @@ static int ssl23_get_server_hello(SSL *s) 
			s->version=TLS1_VERSION;

			s->method=TLSv1_client_method();

			}

		else if ((p[2] == TLS1_1_VERSION_MINOR) &&

			!(s->options & SSL_OP_NO_TLSv1_1))

			{

			s->version=TLS1_1_VERSION;

			s->method=TLSv1_1_client_method();

			}

		else

			{

			SSLerr(SSL_F_SSL23_GET_SERVER_HELLO,SSL_R_UNSUPPORTED_PROTOCOL);

ssl/s23_meth.c

+2 −0
Changes for ssl/s23_meth.c: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ static const SSL_METHOD *ssl23_get_method(int ver) 
#ifndef OPENSSL_NO_TLS1

	if (ver == TLS1_VERSION)

		return(TLSv1_method());

	else if (ver == TLS1_1_VERSION)

		return(TLSv1_1_method());

	else

#endif

		return(NULL);

ssl/s23_srvr.c

+19 −3
Changes for ssl/s23_srvr.c: 19 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ static const SSL_METHOD *ssl23_get_server_method(int ver) 
		return(SSLv3_server_method());

	else if (ver == TLS1_VERSION)

		return(TLSv1_server_method());

	else if (ver == TLS1_1_VERSION)

		return(TLSv1_1_server_method());

	else

		return(NULL);

	}
@@ -283,7 +285,13 @@ int ssl23_get_client_hello(SSL *s) 
				/* SSLv3/TLSv1 */

				if (p[4] >= TLS1_VERSION_MINOR)

					{

					if (!(s->options & SSL_OP_NO_TLSv1))

					if (p[4] >= TLS1_1_VERSION_MINOR &&

					   !(s->options & SSL_OP_NO_TLSv1_1))

						{

						s->version=TLS1_1_VERSION;

						s->state=SSL23_ST_SR_CLNT_HELLO_B;

						}

					else if (!(s->options & SSL_OP_NO_TLSv1))

						{

						s->version=TLS1_VERSION;

						/* type=2; */ /* done later to survive restarts */
@@ -350,7 +358,13 @@ int ssl23_get_client_hello(SSL *s) 
				v[1]=p[10]; /* minor version according to client_version */

			if (v[1] >= TLS1_VERSION_MINOR)

				{

				if (!(s->options & SSL_OP_NO_TLSv1))

				if (v[1] >= TLS1_1_VERSION_MINOR &&

					!(s->options & SSL_OP_NO_TLSv1_1))

					{

					s->version=TLS1_1_VERSION;

					type=3;

					}

				else if (!(s->options & SSL_OP_NO_TLSv1))

					{

					s->version=TLS1_VERSION;

					type=3;
@@ -568,7 +582,9 @@ int ssl23_get_client_hello(SSL *s) 
			s->s3->rbuf.offset=0;

			}



		if (s->version == TLS1_VERSION)

		if (s->version == TLS1_1_VERSION)

			s->method = TLSv1_1_server_method();

		else if (s->version == TLS1_VERSION)

			s->method = TLSv1_server_method();

		else

			s->method = SSLv3_server_method();

ssl/s3_pkt.c

+22 −3
Changes for ssl/s3_pkt.c: 22 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ 
#include "ssl_locl.h"

#include <openssl/evp.h>

#include <openssl/buffer.h>

#include <openssl/rand.h>



static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,

			 unsigned int len, int create_empty_fragment);
@@ -629,6 +630,7 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf, 
	unsigned char *p,*plen;

	int i,mac_size,clear=0;

	int prefix_len=0;

	int eivlen;

	long align=0;

	SSL3_RECORD *wr;

	SSL3_BUFFER *wb=&(s->s3->wbuf);
@@ -738,9 +740,18 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf, 
	/* field where we are to write out packet length */

	plen=p; 

	p+=2;

	/* Explicit IV length, block ciphers and TLS version 1.1 or later */

	if (s->enc_write_ctx && s->version >= TLS1_1_VERSION)

		{

		eivlen = EVP_CIPHER_CTX_iv_length(s->enc_write_ctx);

		if (eivlen <= 1)

			eivlen = 0;

		}

	else 

		eivlen = 0;



	/* lets setup the record stuff. */

	wr->data=p;

	wr->data=p + eivlen;

	wr->length=(int)len;

	wr->input=(unsigned char *)buf;
@@ -768,11 +779,19 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf, 


	if (mac_size != 0)

		{

		if (s->method->ssl3_enc->mac(s,&(p[wr->length]),1) < 0)

		if (s->method->ssl3_enc->mac(s,&(p[wr->length + eivlen]),1) < 0)

			goto err;

		wr->length+=mac_size;

		}



	wr->input=p;

	wr->data=p;



	if (eivlen)

		{

	/*	if (RAND_pseudo_bytes(p, eivlen) <= 0)

			goto err; */

		wr->length += eivlen;

		}



	/* ssl3_enc can only have an error on read */
@@ -1295,7 +1314,7 @@ start: 
	default:

#ifndef OPENSSL_NO_TLS

		/* TLS just ignores unknown message types */

		if (s->version == TLS1_VERSION)

		if (s->version >= TLS1_VERSION && s->version <= TLS1_1_VERSION)

			{

			rr->length = 0;

			goto start;

ssl/ssl.h

+7 −1
Changes for ssl/ssl.h: 7 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -298,6 +298,7 @@ extern "C" { 
#define SSL_TXT_SSLV2		"SSLv2"

#define SSL_TXT_SSLV3		"SSLv3"

#define SSL_TXT_TLSV1		"TLSv1"

#define SSL_TXT_TLSV1_1		"TLSv1.1"



#define SSL_TXT_EXP		"EXP"

#define SSL_TXT_EXPORT		"EXPORT"
@@ -526,6 +527,7 @@ typedef struct ssl_session_st 
#define SSL_OP_SSLEAY_080_CLIENT_DH_BUG			0x00000080L

#define SSL_OP_TLS_D5_BUG				0x00000100L

#define SSL_OP_TLS_BLOCK_PADDING_BUG			0x00000200L

#define SSL_OP_NO_TLSv1_1				0x00000400L



/* Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added

 * in OpenSSL 0.9.6d.  Usually (depending on the application protocol)
@@ -536,7 +538,7 @@ typedef struct ssl_session_st 


/* SSL_OP_ALL: various bug workarounds that should be rather harmless.

 *             This used to be 0x000FFFFFL before 0.9.7. */

#define SSL_OP_ALL					0x80000FFFL

#define SSL_OP_ALL					0x80000BFFL



/* DTLS options */

#define SSL_OP_NO_QUERY_MTU                 0x00001000L
@@ -1647,6 +1649,10 @@ const SSL_METHOD *TLSv1_method(void); /* TLSv1.0 */ 
const SSL_METHOD *TLSv1_server_method(void);	/* TLSv1.0 */

const SSL_METHOD *TLSv1_client_method(void);	/* TLSv1.0 */



const SSL_METHOD *TLSv1_1_method(void);		/* TLSv1.1 */

const SSL_METHOD *TLSv1_1_server_method(void);	/* TLSv1.1 */

const SSL_METHOD *TLSv1_1_client_method(void);	/* TLSv1.1 */



const SSL_METHOD *DTLSv1_method(void);		/* DTLSv1.0 */

const SSL_METHOD *DTLSv1_server_method(void);	/* DTLSv1.0 */

const SSL_METHOD *DTLSv1_client_method(void);	/* DTLSv1.0 */