Fixup previous merge.
authorBernd Edlinger <bernd.edlinger@hotmail.de>
Wed, 22 Feb 2017 07:14:07 +0000 (08:14 +0100)
committerMatt Caswell <matt@openssl.org>
Fri, 10 Mar 2017 14:48:40 +0000 (14:48 +0000)
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

index 5ab7223..22a368d 100644 (file)
@@ -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