Commit 5d28381a authored Apr 10, 2015 by Matt Caswell

Fix ssl_get_prev_session overrun



If OpenSSL is configured with no-tlsext then ssl_get_prev_session can read
past the end of the ClientHello message if the session_id length in the
ClientHello is invalid. This should not cause any security issues since the
underlying buffer is 16k in size. It should never be possible to overrun by
that many bytes.

This is probably made redundant by the previous commit - but you can never be
too careful.

With thanks to Qinghao Tang for reporting this issue.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 5e0a80c1)

Conflicts:
	ssl/ssl_sess.c

parent eeda9661

ssl/ssl_sess.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -310,6 +310,12 @@ int ssl_get_prev_session(SSL s, unsigned char session_id, int len,

		if (len > SSL_MAX_SSL_SESSION_ID_LENGTH)
		goto err;

		if (session_id + len > limit) {
		fatal = 1;
		goto err;
		}

		#ifndef OPENSSL_NO_TLSEXT
		r = tls1_process_ticket(s, session_id, len, limit, &ret);
		if (r == -1) {

Admin message