1d20b5
diff -up openssl-0.9.8j/ssl/t1_lib.c.eap-fast openssl-0.9.8j/ssl/t1_lib.c
1d20b5
--- openssl-0.9.8j/ssl/t1_lib.c.eap-fast	2009-01-14 16:39:41.000000000 +0100
1d20b5
+++ openssl-0.9.8j/ssl/t1_lib.c	2009-01-14 21:35:38.000000000 +0100
1d20b5
@@ -106,6 +106,12 @@ int tls1_new(SSL *s)
1d20b5
 
1d20b5
 void tls1_free(SSL *s)
1d20b5
 	{
1d20b5
+#ifndef OPENSSL_NO_TLSEXT
1d20b5
+	if (s && s->tlsext_session_ticket)
1d20b5
+		{
1d20b5
+		OPENSSL_free(s->tlsext_session_ticket);
1d20b5
+		}
1d20b5
+#endif /* OPENSSL_NO_TLSEXT */
1d20b5
 	ssl3_free(s);
1d20b5
 	}
1d20b5
 
1d20b5
@@ -180,8 +186,23 @@ unsigned char *ssl_add_clienthello_tlsex
1d20b5
 		int ticklen;
1d20b5
 		if (s->session && s->session->tlsext_tick)
1d20b5
 			ticklen = s->session->tlsext_ticklen;
1d20b5
+		else if (s->session && s->tlsext_session_ticket &&
1d20b5
+			 s->tlsext_session_ticket->data)
1d20b5
+			{
1d20b5
+			ticklen = s->tlsext_session_ticket->length;
1d20b5
+			s->session->tlsext_tick = OPENSSL_malloc(ticklen);
1d20b5
+			if (!s->session->tlsext_tick)
1d20b5
+				return NULL;
1d20b5
+			memcpy(s->session->tlsext_tick,
1d20b5
+			       s->tlsext_session_ticket->data,
1d20b5
+			       ticklen);
1d20b5
+			s->session->tlsext_ticklen = ticklen;
1d20b5
+			}
1d20b5
 		else
1d20b5
 			ticklen = 0;
1d20b5
+		if (ticklen == 0 && s->tlsext_session_ticket &&
1d20b5
+		    s->tlsext_session_ticket->data == NULL)
1d20b5
+			goto skip_ext;
1d20b5
 		/* Check for enough room 2 for extension type, 2 for len
1d20b5
  		 * rest for ticket
1d20b5
   		 */
1d20b5
@@ -195,6 +216,7 @@ unsigned char *ssl_add_clienthello_tlsex
1d20b5
 			ret += ticklen;
1d20b5
 			}
1d20b5
 		}
1d20b5
+		skip_ext:
1d20b5
 
1d20b5
 	if (s->tlsext_status_type == TLSEXT_STATUSTYPE_ocsp)
1d20b5
 		{
1d20b5
@@ -417,6 +439,15 @@ int ssl_parse_clienthello_tlsext(SSL *s,
1d20b5
 				}
1d20b5
 
1d20b5
 			}
1d20b5
+		else if (type == TLSEXT_TYPE_session_ticket) 
1d20b5
+			{ 
1d20b5
+			if (s->tls_session_ticket_ext_cb && 
1d20b5
+			    !s->tls_session_ticket_ext_cb(s, data, size, s->tls_session_ticket_ext_cb_arg)) 
1d20b5
+				{ 
1d20b5
+				*al = TLS1_AD_INTERNAL_ERROR; 
1d20b5
+				return 0; 
1d20b5
+				} 
1d20b5
+			} 
1d20b5
 		else if (type == TLSEXT_TYPE_status_request
1d20b5
 						&& s->ctx->tlsext_status_cb)
1d20b5
 			{
1d20b5
@@ -563,6 +594,12 @@ int ssl_parse_serverhello_tlsext(SSL *s,
1d20b5
 			}
1d20b5
 		else if (type == TLSEXT_TYPE_session_ticket)
1d20b5
 			{
1d20b5
+			if (s->tls_session_ticket_ext_cb &&
1d20b5
+			    !s->tls_session_ticket_ext_cb(s, data, size, s->tls_session_ticket_ext_cb_arg))
1d20b5
+				{
1d20b5
+				*al = TLS1_AD_INTERNAL_ERROR;
1d20b5
+				return 0;
1d20b5
+				}
1d20b5
 			if ((SSL_get_options(s) & SSL_OP_NO_TICKET)
1d20b5
 				|| (size > 0))
1d20b5
 				{
1d20b5
@@ -786,6 +823,15 @@ int tls1_process_ticket(SSL *s, unsigned
1d20b5
 				s->tlsext_ticket_expected = 1;
1d20b5
 				return 0;	/* Cache miss */
1d20b5
 				}
1d20b5
+			if (s->tls_session_secret_cb)
1d20b5
+				{
1d20b5
+				/* Indicate cache miss here and instead of
1d20b5
+				 * generating the session from ticket now,
1d20b5
+				 * trigger abbreviated handshake based on
1d20b5
+				 * external mechanism to calculate the master
1d20b5
+				 * secret later. */
1d20b5
+				return 0;
1d20b5
+				}
1d20b5
 			return tls_decrypt_ticket(s, p, size, session_id, len,
1d20b5
 									ret);
1d20b5
 			}
1d20b5
diff -up openssl-0.9.8j/ssl/s3_clnt.c.eap-fast openssl-0.9.8j/ssl/s3_clnt.c
1d20b5
--- openssl-0.9.8j/ssl/s3_clnt.c.eap-fast	2009-01-07 11:48:23.000000000 +0100
1d20b5
+++ openssl-0.9.8j/ssl/s3_clnt.c	2009-01-14 21:13:47.000000000 +0100
1d20b5
@@ -759,6 +759,23 @@ int ssl3_get_server_hello(SSL *s)
1d20b5
 		goto f_err;
1d20b5
 		}
1d20b5
 
1d20b5
+#ifndef OPENSSL_NO_TLSEXT
1d20b5
+	/* check if we want to resume the session based on external pre-shared secret */
1d20b5
+	if (s->version >= TLS1_VERSION && s->tls_session_secret_cb)
1d20b5
+		{
1d20b5
+		SSL_CIPHER *pref_cipher=NULL;
1d20b5
+		s->session->master_key_length=sizeof(s->session->master_key);
1d20b5
+		if (s->tls_session_secret_cb(s, s->session->master_key,
1d20b5
+					     &s->session->master_key_length,
1d20b5
+					     NULL, &pref_cipher,
1d20b5
+					     s->tls_session_secret_cb_arg))
1d20b5
+			{
1d20b5
+			s->session->cipher = pref_cipher ?
1d20b5
+				pref_cipher : ssl_get_cipher_by_char(s, p+j);
1d20b5
+			}
1d20b5
+		}
1d20b5
+#endif /* OPENSSL_NO_TLSEXT */
1d20b5
+
1d20b5
 	if (j != 0 && j == s->session->session_id_length
1d20b5
 	    && memcmp(p,s->session->session_id,j) == 0)
1d20b5
 	    {
1d20b5
@@ -2701,11 +2718,8 @@ static int ssl3_check_finished(SSL *s)
1d20b5
 	{
1d20b5
 	int ok;
1d20b5
 	long n;
1d20b5
-	/* If we have no ticket or session ID is non-zero length (a match of
1d20b5
-	 * a non-zero session length would never reach here) it cannot be a
1d20b5
-	 * resumed session.
1d20b5
-	 */
1d20b5
-	if (!s->session->tlsext_tick || s->session->session_id_length)
1d20b5
+	/* If we have no ticket it cannot be a resumed session. */
1d20b5
+	if (!s->session->tlsext_tick)
1d20b5
 		return 1;
1d20b5
 	/* this function is called when we really expect a Certificate
1d20b5
 	 * message, so permit appropriate message length */
1d20b5
diff -up openssl-0.9.8j/ssl/ssl_sess.c.eap-fast openssl-0.9.8j/ssl/ssl_sess.c
1d20b5
--- openssl-0.9.8j/ssl/ssl_sess.c.eap-fast	2008-06-04 20:35:27.000000000 +0200
1d20b5
+++ openssl-0.9.8j/ssl/ssl_sess.c	2009-01-14 21:13:47.000000000 +0100
1d20b5
@@ -707,6 +707,61 @@ long SSL_CTX_get_timeout(const SSL_CTX *
1d20b5
 	return(s->session_timeout);
1d20b5
 	}
1d20b5
 
1d20b5
+#ifndef OPENSSL_NO_TLSEXT
1d20b5
+int SSL_set_session_secret_cb(SSL *s, int (*tls_session_secret_cb)(SSL *s, void *secret, int *secret_len,
1d20b5
+	STACK_OF(SSL_CIPHER) *peer_ciphers, SSL_CIPHER **cipher, void *arg), void *arg)
1d20b5
+	{
1d20b5
+	if (s == NULL) return(0);
1d20b5
+	s->tls_session_secret_cb = tls_session_secret_cb;
1d20b5
+	s->tls_session_secret_cb_arg = arg;
1d20b5
+	return(1);
1d20b5
+	}
1d20b5
+
1d20b5
+int SSL_set_session_ticket_ext_cb(SSL *s, tls_session_ticket_ext_cb_fn cb,
1d20b5
+				  void *arg)
1d20b5
+	{
1d20b5
+	if (s == NULL) return(0);
1d20b5
+	s->tls_session_ticket_ext_cb = cb;
1d20b5
+	s->tls_session_ticket_ext_cb_arg = arg;
1d20b5
+	return(1);
1d20b5
+	}
1d20b5
+
1d20b5
+int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len)
1d20b5
+	{
1d20b5
+	if (s->version >= TLS1_VERSION)
1d20b5
+		{
1d20b5
+		if (s->tlsext_session_ticket)
1d20b5
+			{
1d20b5
+			OPENSSL_free(s->tlsext_session_ticket);
1d20b5
+			s->tlsext_session_ticket = NULL;
1d20b5
+			}
1d20b5
+
1d20b5
+		s->tlsext_session_ticket = OPENSSL_malloc(sizeof(TLS_SESSION_TICKET_EXT) + ext_len);
1d20b5
+		if (!s->tlsext_session_ticket)
1d20b5
+			{
1d20b5
+			SSLerr(SSL_F_SSL_SET_SESSION_TICKET_EXT, ERR_R_MALLOC_FAILURE);
1d20b5
+			return 0;
1d20b5
+			}
1d20b5
+
1d20b5
+		if (ext_data)
1d20b5
+			{
1d20b5
+			s->tlsext_session_ticket->length = ext_len;
1d20b5
+			s->tlsext_session_ticket->data = s->tlsext_session_ticket + 1;
1d20b5
+			memcpy(s->tlsext_session_ticket->data, ext_data, ext_len);
1d20b5
+			}
1d20b5
+		else
1d20b5
+			{
1d20b5
+			s->tlsext_session_ticket->length = 0;
1d20b5
+			s->tlsext_session_ticket->data = NULL;
1d20b5
+			}
1d20b5
+
1d20b5
+		return 1;
1d20b5
+		}
1d20b5
+
1d20b5
+	return 0;
1d20b5
+	}
1d20b5
+#endif /* OPENSSL_NO_TLSEXT */
1d20b5
+
1d20b5
 typedef struct timeout_param_st
1d20b5
 	{
1d20b5
 	SSL_CTX *ctx;
1d20b5
diff -up openssl-0.9.8j/ssl/s3_srvr.c.eap-fast openssl-0.9.8j/ssl/s3_srvr.c
1d20b5
--- openssl-0.9.8j/ssl/s3_srvr.c.eap-fast	2009-01-07 11:48:23.000000000 +0100
1d20b5
+++ openssl-0.9.8j/ssl/s3_srvr.c	2009-01-14 21:22:37.000000000 +0100
1d20b5
@@ -965,6 +965,59 @@ int ssl3_get_client_hello(SSL *s)
1d20b5
 			SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_CLIENTHELLO_TLSEXT);
1d20b5
 			goto err;
1d20b5
 		}
1d20b5
+
1d20b5
+	/* Check if we want to use external pre-shared secret for this
1d20b5
+	 * handshake for not reused session only. We need to generate
1d20b5
+	 * server_random before calling tls_session_secret_cb in order to allow
1d20b5
+	 * SessionTicket processing to use it in key derivation. */
1d20b5
+	{
1d20b5
+		unsigned long Time;
1d20b5
+		unsigned char *pos;
1d20b5
+		Time=(unsigned long)time(NULL);			/* Time */
1d20b5
+		pos=s->s3->server_random;
1d20b5
+		l2n(Time,pos);
1d20b5
+		if (RAND_pseudo_bytes(pos,SSL3_RANDOM_SIZE-4) <= 0)
1d20b5
+			{
1d20b5
+			al=SSL_AD_INTERNAL_ERROR;
1d20b5
+			goto f_err;
1d20b5
+			}
1d20b5
+	}
1d20b5
+
1d20b5
+	if (!s->hit && s->version >= TLS1_VERSION && s->tls_session_secret_cb)
1d20b5
+		{
1d20b5
+		SSL_CIPHER *pref_cipher=NULL;
1d20b5
+
1d20b5
+		s->session->master_key_length=sizeof(s->session->master_key);
1d20b5
+		if(s->tls_session_secret_cb(s, s->session->master_key, &s->session->master_key_length,
1d20b5
+			ciphers, &pref_cipher, s->tls_session_secret_cb_arg))
1d20b5
+			{
1d20b5
+			s->hit=1;
1d20b5
+			s->session->ciphers=ciphers;
1d20b5
+			s->session->verify_result=X509_V_OK;
1d20b5
+
1d20b5
+			ciphers=NULL;
1d20b5
+
1d20b5
+			/* check if some cipher was preferred by call back */
1d20b5
+			pref_cipher=pref_cipher ? pref_cipher : ssl3_choose_cipher(s, s->session->ciphers, SSL_get_ciphers(s));
1d20b5
+			if (pref_cipher == NULL)
1d20b5
+				{
1d20b5
+				al=SSL_AD_HANDSHAKE_FAILURE;
1d20b5
+				SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_SHARED_CIPHER);
1d20b5
+				goto f_err;
1d20b5
+				}
1d20b5
+
1d20b5
+			s->session->cipher=pref_cipher;
1d20b5
+
1d20b5
+			if (s->cipher_list)
1d20b5
+				sk_SSL_CIPHER_free(s->cipher_list);
1d20b5
+
1d20b5
+			if (s->cipher_list_by_id)
1d20b5
+				sk_SSL_CIPHER_free(s->cipher_list_by_id);
1d20b5
+
1d20b5
+			s->cipher_list = sk_SSL_CIPHER_dup(s->session->ciphers);
1d20b5
+			s->cipher_list_by_id = sk_SSL_CIPHER_dup(s->session->ciphers);
1d20b5
+			}
1d20b5
+		}
1d20b5
 #endif
1d20b5
 	/* Worst case, we will use the NULL compression, but if we have other
1d20b5
 	 * options, we will now look for them.  We have i-1 compression
1d20b5
@@ -1103,16 +1156,22 @@ int ssl3_send_server_hello(SSL *s)
1d20b5
 	unsigned char *buf;
1d20b5
 	unsigned char *p,*d;
1d20b5
 	int i,sl;
1d20b5
-	unsigned long l,Time;
1d20b5
+	unsigned long l;
1d20b5
+#ifdef OPENSSL_NO_TLSEXT
1d20b5
+	unsigned long Time;
1d20b5
+#endif
1d20b5
 
1d20b5
 	if (s->state == SSL3_ST_SW_SRVR_HELLO_A)
1d20b5
 		{
1d20b5
 		buf=(unsigned char *)s->init_buf->data;
1d20b5
+#ifdef OPENSSL_NO_TLSEXT
1d20b5
 		p=s->s3->server_random;
1d20b5
+		/* Generate server_random if it was not needed previously */
1d20b5
 		Time=(unsigned long)time(NULL);			/* Time */
1d20b5
 		l2n(Time,p);
1d20b5
 		if (RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0)
1d20b5
 			return -1;
1d20b5
+#endif
1d20b5
 		/* Do the message type and length last */
1d20b5
 		d=p= &(buf[4]);
1d20b5
 
1d20b5
diff -up openssl-0.9.8j/ssl/tls1.h.eap-fast openssl-0.9.8j/ssl/tls1.h
1d20b5
--- openssl-0.9.8j/ssl/tls1.h.eap-fast	2009-01-14 16:39:41.000000000 +0100
1d20b5
+++ openssl-0.9.8j/ssl/tls1.h	2009-01-14 21:13:47.000000000 +0100
1d20b5
@@ -398,6 +398,13 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_T
1d20b5
 #define TLS_MD_MASTER_SECRET_CONST    "\x6d\x61\x73\x74\x65\x72\x20\x73\x65\x63\x72\x65\x74"  /*master secret*/
1d20b5
 #endif
1d20b5
 
1d20b5
+/* TLS Session Ticket extension struct */
1d20b5
+struct tls_session_ticket_ext_st
1d20b5
+	{
1d20b5
+	unsigned short length;
1d20b5
+	void *data;
1d20b5
+	};
1d20b5
+
1d20b5
 #ifdef  __cplusplus
1d20b5
 }
1d20b5
 #endif
1d20b5
diff -up openssl-0.9.8j/ssl/ssl_err.c.eap-fast openssl-0.9.8j/ssl/ssl_err.c
1d20b5
--- openssl-0.9.8j/ssl/ssl_err.c.eap-fast	2008-08-13 21:44:44.000000000 +0200
1d20b5
+++ openssl-0.9.8j/ssl/ssl_err.c	2009-01-14 21:13:47.000000000 +0100
1d20b5
@@ -253,6 +253,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
1d20b5
 {ERR_FUNC(SSL_F_TLS1_ENC),	"TLS1_ENC"},
1d20b5
 {ERR_FUNC(SSL_F_TLS1_SETUP_KEY_BLOCK),	"TLS1_SETUP_KEY_BLOCK"},
1d20b5
 {ERR_FUNC(SSL_F_WRITE_PENDING),	"WRITE_PENDING"},
1d20b5
+{ERR_FUNC(SSL_F_SSL_SET_SESSION_TICKET_EXT), "SSL_set_session_ticket_ext"},
1d20b5
 {0,NULL}
1d20b5
 	};
1d20b5
 
1d20b5
diff -up openssl-0.9.8j/ssl/ssl.h.eap-fast openssl-0.9.8j/ssl/ssl.h
1d20b5
--- openssl-0.9.8j/ssl/ssl.h.eap-fast	2009-01-14 16:39:41.000000000 +0100
1d20b5
+++ openssl-0.9.8j/ssl/ssl.h	2009-01-14 21:26:45.000000000 +0100
1d20b5
@@ -344,6 +344,7 @@ extern "C" {
1d20b5
  * 'struct ssl_st *' function parameters used to prototype callbacks
1d20b5
  * in SSL_CTX. */
1d20b5
 typedef struct ssl_st *ssl_crock_st;
1d20b5
+typedef struct tls_session_ticket_ext_st TLS_SESSION_TICKET_EXT;
1d20b5
 
1d20b5
 /* used to hold info on the particular ciphers used */
1d20b5
 typedef struct ssl_cipher_st
1d20b5
@@ -362,6 +363,9 @@ typedef struct ssl_cipher_st
1d20b5
 
1d20b5
 DECLARE_STACK_OF(SSL_CIPHER)
1d20b5
 
1d20b5
+typedef int (*tls_session_ticket_ext_cb_fn)(SSL *s, const unsigned char *data, int len, void *arg);
1d20b5
+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);
1d20b5
+
1d20b5
 /* Used to hold functions for SSLv2 or SSLv3/TLSv1 functions */
1d20b5
 typedef struct ssl_method_st
1d20b5
 	{
1d20b5
@@ -1034,6 +1038,18 @@ struct ssl_st
1d20b5
 
1d20b5
 	/* RFC4507 session ticket expected to be received or sent */
1d20b5
 	int tlsext_ticket_expected;
1d20b5
+
1d20b5
+	/* TLS Session Ticket extension override */ 
1d20b5
+	TLS_SESSION_TICKET_EXT *tlsext_session_ticket; 
1d20b5
+
1d20b5
+	/* TLS Session Ticket extension callback */ 
1d20b5
+	tls_session_ticket_ext_cb_fn tls_session_ticket_ext_cb; 
1d20b5
+	void *tls_session_ticket_ext_cb_arg; 
1d20b5
+
1d20b5
+	/* TLS pre-shared secret session resumption */ 
1d20b5
+	tls_session_secret_cb_fn tls_session_secret_cb; 
1d20b5
+	void *tls_session_secret_cb_arg; 
1d20b5
+
1d20b5
 	SSL_CTX * initial_ctx; /* initial ctx, used to store sessions */
1d20b5
 #define session_ctx initial_ctx
1d20b5
 #else
1d20b5
@@ -1624,6 +1640,15 @@ void *SSL_COMP_get_compression_methods(v
1d20b5
 int SSL_COMP_add_compression_method(int id,void *cm);
1d20b5
 #endif
1d20b5
 
1d20b5
+/* TLS extensions functions */
1d20b5
+int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len);
1d20b5
+
1d20b5
+int SSL_set_session_ticket_ext_cb(SSL *s, tls_session_ticket_ext_cb_fn cb,
1d20b5
+				  void *arg);
1d20b5
+
1d20b5
+/* Pre-shared secret session resumption functions */
1d20b5
+int SSL_set_session_secret_cb(SSL *s, tls_session_secret_cb_fn tls_session_secret_cb, void *arg);
1d20b5
+
1d20b5
 /* BEGIN ERROR CODES */
1d20b5
 /* The following lines are auto generated by the script mkerr.pl. Any changes
1d20b5
  * made after this point may be overwritten when the script is next run.
1d20b5
@@ -1816,6 +1841,7 @@ void ERR_load_SSL_strings(void);
1d20b5
 #define SSL_F_TLS1_ENC					 210
1d20b5
 #define SSL_F_TLS1_SETUP_KEY_BLOCK			 211
1d20b5
 #define SSL_F_WRITE_PENDING				 212
1d20b5
+#define SSL_F_SSL_SET_SESSION_TICKET_EXT		 213
1d20b5
 
1d20b5
 /* Reason codes. */
1d20b5
 #define SSL_R_APP_DATA_IN_HANDSHAKE			 100