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

Re-revert (re-insert?) temporary change that made renegotiation work again 

and add a proper fix: specifically if it is a new session don't send the old
TLS ticket, send a zero length ticket to request a new session.
parent d99a35f2

ssl/s3_clnt.c

+22 −1
Original line number Diff line number Diff line
@@ -1744,7 +1744,28 @@ int ssl3_get_new_session_ticket(SSL *s) 
		}

	memcpy(s->session->tlsext_tick, p, ticklen);

	s->session->tlsext_ticklen = ticklen;

	

	/* There are two ways to detect a resumed ticket sesion.

	 * One is to set an appropriate session ID and then the server

	 * must return a match in ServerHello. This allows the normal

	 * client session ID matching to work and we know much 

	 * earlier that the ticket has been accepted.

	 * 

	 * The other way is to set zero length session ID when the

	 * ticket is presented and rely on the handshake to determine

	 * session resumption.

	 *

	 * We choose the former approach because this fits in with

	 * assumptions elsewhere in OpenSSL. The session ID is set

	 * to the SHA256 (or SHA1 is SHA256 is disabled) hash of the

	 * ticket.

	 */ 

	EVP_Digest(p, ticklen,

			s->session->session_id, &s->session->session_id_length,

#ifndef OPENSSL_NO_SHA256

							EVP_sha256(), NULL);

#else

							EVP_sha1(), NULL);

#endif

	ret=1;

	return(ret);

f_err:

ssl/t1_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned cha 
	if (!(SSL_get_options(s) & SSL_OP_NO_TICKET))

		{

		int ticklen;

		if (s->session && s->session->tlsext_tick)

		if (!s->new_session && s->session && s->session->tlsext_tick)

			ticklen = s->session->tlsext_ticklen;

		else

			ticklen = 0;