summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-08-13 10:04:23 +0100
committerMatt Caswell <matt@openssl.org>2015-08-14 17:00:11 +0100
commitc83eda8c22f08346d5434662643de523a469c81e (patch)
treeb9be81a702026cdbea4fb3439bd23d9e4b92f729 /ssl
parentf8f5f8369d1d76fd8ec28d3d2422a47f8440f452 (diff)
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>
Diffstat (limited to 'ssl')
-rw-r--r--ssl/t1_lib.c5
1 files changed, 5 insertions, 0 deletions
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;