From: Matt Caswell <matt@openssl.org>
Date: Thu, 13 Aug 2015 09:04:23 +0000 (+0100)
Subject: Fix session tickets
X-Git-Tag: OpenSSL_1_1_0-pre1~803
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=c83eda8c22f08346d5434662643de523a469c81e

Fix session tickets

Commit 9ceb2426b0 (PACKETise ClientHello) broke session tickets by failing
to detect the session ticket extension in an incoming ClientHello. This
commit fixes the bug.

Reviewed-by: Emilia Käsper <emilia@openssl.org>
---

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index e37411ccbf..f0042886c6 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -3043,6 +3043,11 @@ int tls1_process_ticket(SSL *s, PACKET *pkt,  unsigned char *session_id,
                 break;
             }
             goto end;
+        } else {
+            if (!PACKET_forward(pkt, size)) {
+                retv = -1;
+                goto end;
+            }
         }
     }
     retv = 0;