From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Wed, 22 Feb 2017 07:14:07 +0000 (+0100)
Subject: Fixup previous merge.
X-Git-Tag: OpenSSL_1_1_1-pre1~2081
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0b1f26648671b94e2ae3e11d602556a4e46535ce;p=oweals%2Fopenssl.git

Fixup previous merge.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2703)
---

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 5ab7223476..22a368defe 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1316,7 +1316,7 @@ TICKET_RETURN tls_decrypt_ticket(SSL *s, const unsigned char *etick,
         /* Some additional consistency checks */
         if (p != sdec + slen || sess->session_id_length != 0) {
             SSL_SESSION_free(sess);
-            return 2;
+            return TICKET_NO_DECRYPT;
         }
         /*
          * The session ID, if non-empty, is used by some clients to detect