From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 29 Apr 2008 17:22:35 +0000 (+0000)
Subject: Update from stable branch.
X-Git-Tag: OpenSSL_0_9_8k^2~415
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2f63ad5b35920ce1cbd52f33341e49ccd2541a54;p=oweals%2Fopenssl.git

Update from stable branch.
---

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 74f5abe13c..4ca47faf51 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -2918,7 +2918,11 @@ static int ssl3_check_finished(SSL *s)
 	{
 	int ok;
 	long n;
-	if (!s->session->tlsext_tick)
+	/* 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)
 		return 1;
 	/* this function is called when we really expect a Certificate
 	 * message, so permit appropriate message length */