[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  0b1f26648671b94e2ae3e11d602556a4e46535ce (commit)
      from  e5fd8ca43beeb40d33d421b519fb7e1d20358b94 (commit)


- Log -----------------------------------------------------------------
commit 0b1f26648671b94e2ae3e11d602556a4e46535ce
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Wed Feb 22 08:14:07 2017 +0100

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

-----------------------------------------------------------------------

Summary of changes:
 ssl/t1_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@ 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