commit 0b1f26648671b94e2ae3e11d602556a4e46535ce
author Bernd Edlinger <bernd.edlinger@hotmail.de> Wed Feb 22 08:14:07 2017 +0100
committer Matt Caswell <matt@openssl.org> Fri Mar 10 14:48:40 2017 +0000
tree 66b172d170c863e1b8c97cbf03aad41a1d26257c
parent e5fd8ca43beeb40d33d421b519fb7e1d20358b94

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)

ssl/t1_lib.c

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 5ab7223..22a368d 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1316,7 +1316,7 @@
         /* 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