From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 3 Nov 2007 13:09:34 +0000 (+0000)
Subject: Fix from stable branch.
X-Git-Tag: OpenSSL_0_9_8k^2~632
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=31f528b15de7bc2afbbdc592973a3a50da9b1629;hp=86140095b55272f06feaf4b3a9ae7e68c13af458

Fix from stable branch.
---

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 8141a5c6a1..09883eaa88 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -295,7 +295,10 @@ int ssl3_connect(SSL *s)
 			if (ret == 2)
 				{
 				s->hit = 1;
-				s->state=SSL3_ST_CR_FINISHED_A;
+				if (s->tlsext_ticket_expected)
+					s->state=SSL3_ST_CR_SESSION_TICKET_A;
+				else
+					s->state=SSL3_ST_CR_FINISHED_A;
 				s->init_num=0;
 				break;
 				}