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

PR: 1574 

Submitted by: Jouni Malinen <j@w1.fi>
Approved by: steve@openssl.org

Ticket override support for EAP-FAST.
parent 93c4ba07

CHANGES

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


 Changes between 0.9.8j and 0.9.9  [xx XXX xxxx]



  *) Add session ticket override functionality for use by EAP-FAST.

     [Jouni Malinen <j@w1.fi>]



  *) Modify HMAC functions to return a value. Since these can be implemented

     in an ENGINE errors can occur.

     [Steve Henson]

ssl/s3_clnt.c

+19 −5
Original line number Diff line number Diff line
@@ -788,6 +788,23 @@ int ssl3_get_server_hello(SSL *s) 
		goto f_err;

		}



#ifndef OPENSSL_NO_TLSEXT

	/* check if we want to resume the session based on external pre-shared secret */

	if (s->version >= TLS1_VERSION && s->tls_session_secret_cb)

		{

		SSL_CIPHER *pref_cipher=NULL;

		s->session->master_key_length=sizeof(s->session->master_key);

		if (s->tls_session_secret_cb(s, s->session->master_key,

					     &s->session->master_key_length,

					     NULL, &pref_cipher,

					     s->tls_session_secret_cb_arg))

			{

			s->session->cipher = pref_cipher ?

				pref_cipher : ssl_get_cipher_by_char(s, p+j);

			}

		}

#endif /* OPENSSL_NO_TLSEXT */



	if (j != 0 && j == s->session->session_id_length

	    && memcmp(p,s->session->session_id,j) == 0)

	    {
@@ -2927,11 +2944,8 @@ static int ssl3_check_finished(SSL *s) 
	{

	int ok;

	long n;

	/* If we have no ticket or session ID is non-zero length (a match of

	 * a non-zero session length would never reach here) it cannot be a

	 * resumed session.

	 */

	if (!s->session->tlsext_tick || s->session->session_id_length)

	/* If we have no ticket it cannot be a resumed session. */

	if (!s->session->tlsext_tick)

		return 1;

	/* this function is called when we really expect a Certificate

	 * message, so permit appropriate message length */

ssl/s3_srvr.c

+60 −1
Original line number Diff line number Diff line
@@ -1010,6 +1010,59 @@ int ssl3_get_client_hello(SSL *s) 
			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

	 * server_random before calling tls_session_secret_cb in order to allow

	 * SessionTicket processing to use it in key derivation. */

	{

		unsigned long Time;

		unsigned char *pos;

		Time=(unsigned long)time(NULL);			/* Time */

		pos=s->s3->server_random;

		l2n(Time,pos);

		if (RAND_pseudo_bytes(pos,SSL3_RANDOM_SIZE-4) <= 0)

			{

			al=SSL_AD_INTERNAL_ERROR;

			goto f_err;

			}

	}



	if (!s->hit && s->version >= TLS1_VERSION && s->tls_session_secret_cb)

		{

		SSL_CIPHER *pref_cipher=NULL;



		s->session->master_key_length=sizeof(s->session->master_key);

		if(s->tls_session_secret_cb(s, s->session->master_key, &s->session->master_key_length,

			ciphers, &pref_cipher, s->tls_session_secret_cb_arg))

			{

			s->hit=1;

			s->session->ciphers=ciphers;

			s->session->verify_result=X509_V_OK;



			ciphers=NULL;



			/* check if some cipher was preferred by call back */

			pref_cipher=pref_cipher ? pref_cipher : ssl3_choose_cipher(s, s->session->ciphers, SSL_get_ciphers(s));

			if (pref_cipher == NULL)

				{

				al=SSL_AD_HANDSHAKE_FAILURE;

				SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_SHARED_CIPHER);

				goto f_err;

				}



			s->session->cipher=pref_cipher;



			if (s->cipher_list)

				sk_SSL_CIPHER_free(s->cipher_list);



			if (s->cipher_list_by_id)

				sk_SSL_CIPHER_free(s->cipher_list_by_id);



			s->cipher_list = sk_SSL_CIPHER_dup(s->session->ciphers);

			s->cipher_list_by_id = sk_SSL_CIPHER_dup(s->session->ciphers);

			}

		}

#endif



	/* Worst case, we will use the NULL compression, but if we have other
@@ -1134,16 +1187,22 @@ int ssl3_send_server_hello(SSL *s) 
	unsigned char *buf;

	unsigned char *p,*d;

	int i,sl;

	unsigned long l,Time;

	unsigned long l;

#ifdef OPENSSL_NO_TLSEXT

	unsigned long Time;

#endif



	if (s->state == SSL3_ST_SW_SRVR_HELLO_A)

		{

		buf=(unsigned char *)s->init_buf->data;

#ifdef OPENSSL_NO_TLSEXT

		p=s->s3->server_random;

		/* Generate server_random if it was not needed previously */

		Time=(unsigned long)time(NULL);			/* Time */

		l2n(Time,p);

		if (RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0)

			return -1;

#endif

		/* Do the message type and length last */

		d=p= &(buf[4]);

ssl/ssl.h

+25 −0
Original line number Diff line number Diff line
@@ -355,6 +355,7 @@ extern "C" { 
 * 'struct ssl_st *' function parameters used to prototype callbacks

 * in SSL_CTX. */

typedef struct ssl_st *ssl_crock_st;

typedef struct tls_session_ticket_ext_st TLS_SESSION_TICKET_EXT;



/* used to hold info on the particular ciphers used */

typedef struct ssl_cipher_st
@@ -378,6 +379,9 @@ typedef struct ssl_cipher_st 


DECLARE_STACK_OF(SSL_CIPHER)



typedef int (*tls_session_ticket_ext_cb_fn)(SSL *s, const unsigned char *data, int len, void *arg);

typedef int (*tls_session_secret_cb_fn)(SSL *s, void *secret, int *secret_len, STACK_OF(SSL_CIPHER) *peer_ciphers, SSL_CIPHER **cipher, void *arg);



/* Used to hold functions for SSLv2 or SSLv3/TLSv1 functions */

typedef struct ssl_method_st

	{
@@ -1145,6 +1149,17 @@ struct ssl_st 
	void *tlsext_opaque_prf_input;

	size_t tlsext_opaque_prf_input_len;



	/* TLS Session Ticket extension override */

	TLS_SESSION_TICKET_EXT *tlsext_session_ticket;



	/* TLS Session Ticket extension callback */

	tls_session_ticket_ext_cb_fn tls_session_ticket_ext_cb;

	void *tls_session_ticket_ext_cb_arg;



	/* TLS pre-shared secret session resumption */

	tls_session_secret_cb_fn tls_session_secret_cb;

	void *tls_session_secret_cb_arg;



	SSL_CTX * initial_ctx; /* initial ctx, used to store sessions */

#define session_ctx initial_ctx

#else
@@ -1746,6 +1761,15 @@ void *SSL_COMP_get_compression_methods(void); 
int SSL_COMP_add_compression_method(int id,void *cm);

#endif



/* TLS extensions functions */

int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len);



int SSL_set_session_ticket_ext_cb(SSL *s, tls_session_ticket_ext_cb_fn cb,

				  void *arg);



/* Pre-shared secret session resumption functions */

int SSL_set_session_secret_cb(SSL *s, tls_session_secret_cb_fn tls_session_secret_cb, void *arg);



/* BEGIN ERROR CODES */

/* The following lines are auto generated by the script mkerr.pl. Any changes

 * made after this point may be overwritten when the script is next run.
@@ -1948,6 +1972,7 @@ void ERR_load_SSL_strings(void); 
#define SSL_F_TLS1_PRF					 284

#define SSL_F_TLS1_SETUP_KEY_BLOCK			 211

#define SSL_F_WRITE_PENDING				 212

#define SSL_F_SSL_SET_SESSION_TICKET_EXT		 213



/* Reason codes. */

#define SSL_R_APP_DATA_IN_HANDSHAKE			 100

ssl/ssl_err.c

+1 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ static ERR_STRING_DATA SSL_str_functs[]= 
{ERR_FUNC(SSL_F_TLS1_PRF),	"tls1_prf"},

{ERR_FUNC(SSL_F_TLS1_SETUP_KEY_BLOCK),	"TLS1_SETUP_KEY_BLOCK"},

{ERR_FUNC(SSL_F_WRITE_PENDING),	"WRITE_PENDING"},

{ERR_FUNC(SSL_F_SSL_SET_SESSION_TICKET_EXT), "SSL_set_session_ticket_ext"},

{0,NULL}

	};