From d6bb50a5f9201aab638ddf9131a6754cca0ef842 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 28 Sep 2017 13:24:58 +0100 Subject: [PATCH] Fix the SSL_stateless() return code Reviewed-by: Ben Kaduk (Merged from https://github.com/openssl/openssl/pull/4435) --- ssl/ssl_lib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 1daa348f9c..f68031e571 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -5303,7 +5303,7 @@ int SSL_stateless(SSL *s) /* Ensure there is no state left over from a previous invocation */ if (!SSL_clear(s)) - return -1; + return 0; ERR_clear_error(); @@ -5311,8 +5311,8 @@ int SSL_stateless(SSL *s) ret = SSL_accept(s); s->s3->flags &= ~TLS1_FLAGS_STATELESS; - if (s->ext.cookieok) + if (ret > 0 && s->ext.cookieok) return 1; - return ret; + return 0; } -- 2.25.1