Commit 10bda8f8 authored by Matt Caswell's avatar Matt Caswell
Browse files

Reformulate the if condition in tls_process_new_session_ticket 



Improves readability

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6415)
parent 6cf2dbd9

ssl/statem/statem_clnt.c

+2 −3
Original line number Diff line number Diff line
@@ -2566,9 +2566,8 @@ MSG_PROCESS_RETURN tls_process_new_session_ticket(SSL *s, PACKET *pkt) 
            && (!PACKET_get_net_4(pkt, &age_add)

                || !PACKET_get_length_prefixed_1(pkt, &nonce)))

        || !PACKET_get_net_2(pkt, &ticklen)

        || (!SSL_IS_TLS13(s) && PACKET_remaining(pkt) != ticklen)

        || (SSL_IS_TLS13(s)

            && (ticklen == 0 || PACKET_remaining(pkt) < ticklen))) {

        || (SSL_IS_TLS13(s) ? (ticklen == 0 || PACKET_remaining(pkt) < ticklen)

                            : PACKET_remaining(pkt) != ticklen)) {

        SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_F_TLS_PROCESS_NEW_SESSION_TICKET,

                 SSL_R_LENGTH_MISMATCH);

        goto err;