Commit 8c447031 authored by Lutz Jänicke's avatar Lutz Jänicke
Browse files

Prepare OpenSSL 0.9.8g: cherry pick 

  http://cvs.openssl.org/chngview?cn=16691
Don't try to lookup zero length session.
PR: 1591
Submitted by: steve
parent 4875e097

ssl/ssl_sess.c

+3 −1
Original line number Diff line number Diff line
@@ -320,10 +320,12 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len, 
		fatal = 1;

 		goto err;

		}

	else if (r == 0)

	else if (r == 0 || (!ret && !len))

		goto err;

	else if (!ret && !(s->session_ctx->session_cache_mode & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP))

#else

	if (len == 0)

		goto err;

	if (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP))

#endif

		{