Commit 0b1f2664 authored by Bernd Edlinger's avatar Bernd Edlinger Committed by Matt Caswell
Browse files

Fixup previous merge. 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2703)
parent e5fd8ca4

ssl/t1_lib.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1316,7 +1316,7 @@ TICKET_RETURN tls_decrypt_ticket(SSL *s, const unsigned char *etick, 
        /* Some additional consistency checks */

        /* Some additional consistency checks */

        if (p != sdec + slen || sess->session_id_length != 0) {

        if (p != sdec + slen || sess->session_id_length != 0) {

            SSL_SESSION_free(sess);

            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