From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 29 Apr 2008 16:41:53 +0000 (+0000)
Subject: Support ticket renewal in state machine (not used at present).
X-Git-Tag: OpenSSL_0_9_8h~30
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3c8f315021499e1a7289a16e167a134e62c88297;p=oweals%2Fopenssl.git

Support ticket renewal in state machine (not used at present).
---

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index b83a8d7da4..c031a0f763 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -290,9 +290,18 @@ int ssl3_accept(SSL *s)
 		case SSL3_ST_SW_SRVR_HELLO_B:
 			ret=ssl3_send_server_hello(s);
 			if (ret <= 0) goto end;
-
+#ifndef OPENSSL_NO_TLSEXT
 			if (s->hit)
-				s->state=SSL3_ST_SW_CHANGE_A;
+				{
+				if (s->tlsext_ticket_expected)
+					s->state=SSL3_ST_SW_SESSION_TICKET_A;
+				else
+					s->state=SSL3_ST_SW_CHANGE_A;
+				}
+#else
+			if (s->hit)
+					s->state=SSL3_ST_SW_CHANGE_A;
+#endif
 			else
 				s->state=SSL3_ST_SW_CERT_A;
 			s->init_num=0;