From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 3 Sep 2008 22:13:04 +0000 (+0000)
Subject: If tickets disabled behave as if no ticket received to support
X-Git-Tag: OpenSSL_0_9_8i~19
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8f59c61d1d28917b97d8886e07a913b3663c236a;p=oweals%2Fopenssl.git

If tickets disabled behave as if no ticket received to support
stateful resume.
---

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 35f04afa4a..9ce726996d 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -734,6 +734,13 @@ int tls1_process_ticket(SSL *s, unsigned char *session_id, int len,
 	/* Point after session ID in client hello */
 	const unsigned char *p = session_id + len;
 	unsigned short i;
+
+	/* If tickets disabled behave as if no ticket present
+ 	 * to permit stateful resumption.
+ 	 */
+	if (SSL_get_options(s) & SSL_OP_NO_TICKET)
+		return 1;
+
 	if ((s->version <= SSL3_VERSION) || !limit)
 		return 1;
 	if (p >= limit)
@@ -761,12 +768,7 @@ int tls1_process_ticket(SSL *s, unsigned char *session_id, int len,
 			return 1;
 		if (type == TLSEXT_TYPE_session_ticket)
 			{
-			/* If tickets disabled indicate cache miss which will
- 			 * trigger a full handshake
- 			 */
-			if (SSL_get_options(s) & SSL_OP_NO_TICKET)
-				return 0;
-			/* If zero length not client will accept a ticket
+			/* If zero length note client will accept a ticket
  			 * and indicate cache miss to trigger full handshake
  			 */
 			if (size == 0)