From: Matt Caswell <matt@openssl.org>
Date: Thu, 22 Oct 2015 14:02:14 +0000 (+0100)
Subject: Fix empty NewSessionTicket processing
X-Git-Tag: OpenSSL_1_1_0-pre1~335
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c9de4a20fa21101208cf311c5437d9c358ba1f07;p=openssl

Fix empty NewSessionTicket processing

Rebasing the state machine code introduced a problem with empty
NewSessionTicket processing. The return value from the
tls_process_new_session_ticket() is supposed to be an enum, but a bare
integer was being used. Unfortunately this is valid C so the compiler
doesn't pick it up.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index dbba36bc9e..d0c6b1292e 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -2184,7 +2184,7 @@ enum MSG_PROCESS_RETURN tls_process_new_session_ticket(SSL *s, PACKET *pkt)
 
     /* Server is allowed to change its mind and send an empty ticket. */
     if (ticklen == 0)
-        return 1;
+        return MSG_PROCESS_CONTINUE_READING;
 
     if (s->session->session_id_length > 0) {
         int i = s->session_ctx->session_cache_mode;