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 5ab722347667db2ed02f6b384b431c42e9c2e795..22a368defe296515fb0a202a349731bf3a4cea50 100644 (file)
--- 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);
         /* 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
         }
         /*
          * The session ID, if non-empty, is used by some clients to detect