Commit 44f23cd2 authored by Rich Salz's avatar Rich Salz
Browse files

Move fprintf after assignment to avoid crash. 



Thanks to David Vernet for reporting this.

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5140)
parent bbc92cd1

ssl/statem/statem_clnt.c

+4 −3
Original line number Diff line number Diff line
@@ -2280,9 +2280,6 @@ MSG_PROCESS_RETURN tls_process_key_exchange(SSL *s, PACKET *pkt) 
                /* SSLfatal() already called */

                goto err;

            }

#ifdef SSL_DEBUG

            fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md));

#endif

        } else if (!tls1_set_peer_legacy_sigalg(s, pkey)) {

            SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PROCESS_KEY_EXCHANGE,

                     ERR_R_INTERNAL_ERROR);
@@ -2294,6 +2291,10 @@ MSG_PROCESS_RETURN tls_process_key_exchange(SSL *s, PACKET *pkt) 
                     ERR_R_INTERNAL_ERROR);

            goto err;

        }

#ifdef SSL_DEBUG

        if (SSL_USE_SIGALGS(s))

            fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md));

#endif



        if (!PACKET_get_length_prefixed_2(pkt, &signature)

            || PACKET_remaining(pkt) != 0) {