From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 10 Dec 2012 16:45:39 +0000 (+0000)
Subject: PR: 2888
X-Git-Tag: OpenSSL_0_9_8y~26
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=42aa3ec4f20c61ffab48d801085fcf5823c27ed1;p=oweals%2Fopenssl.git

PR: 2888
Reported by: Daniel Black <daniel.black@openquery.com>

Support renewing session tickets (backport from HEAD).
---

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 2c9fb87f52..a17beb8a3b 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -262,7 +262,16 @@ int ssl3_connect(SSL *s)
 			ret=ssl3_get_server_hello(s);
 			if (ret <= 0) goto end;
 			if (s->hit)
+				{
 				s->state=SSL3_ST_CR_FINISHED_A;
+#ifndef OPENSSL_NO_TLSEXT
+				if (s->tlsext_ticket_expected)
+					{
+					/* receive renewed session ticket */
+					s->state=SSL3_ST_CR_SESSION_TICKET_A;
+					}
+#endif
+				}
 			else
 				s->state=SSL3_ST_CR_CERT_A;
 			s->init_num=0;