Commit 8aa38789 authored by Bernd Edlinger's avatar Bernd Edlinger Committed by Rich Salz
Browse files

Add some more consistency checks in tls_decrypt_ticket. 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2704)
(cherry picked from commit 79020b27)
parent bc931874

ssl/t1_lib.c

+5 −0
Original line number Diff line number Diff line
@@ -3172,6 +3172,11 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick, 
    sess = d2i_SSL_SESSION(NULL, &p, slen);

    OPENSSL_free(sdec);

    if (sess) {

        /* Some additional consistency checks */

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

            SSL_SESSION_free(sess);

            return 2;

        }

        /*

         * The session ID, if non-empty, is used by some clients to detect

         * that the ticket has been accepted. So we copy it to the session