aboutsummaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-10-22 15:02:14 +0100
committerMatt Caswell <matt@openssl.org>2015-10-30 08:39:47 +0000
commitc9de4a20fa21101208cf311c5437d9c358ba1f07 (patch)
treef2b0987b34745b78bb18e57eb655a9560a360e30 /ssl
parentd13dd4beb4674689c7a46450dbb8bae9af24d510 (diff)
downloadopenssl-c9de4a20fa21101208cf311c5437d9c358ba1f07.tar.gz
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>
Diffstat (limited to 'ssl')
-rw-r--r--ssl/statem/statem_clnt.c2
1 files changed, 1 insertions, 1 deletions
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;