Commit 26fb4b03 authored by Rich Salz's avatar Rich Salz
Browse files

if log fails, avoid pms getting double free 



doing the pms assignment after log is successful

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3278)
parent cb2a6eb7

ssl/statem/statem_clnt.c

+3 −3
Original line number Diff line number Diff line
@@ -2854,13 +2854,13 @@ static int tls_construct_cke_rsa(SSL *s, WPACKET *pkt, int *al) 
        goto err;

    }



    s->s3->tmp.pms = pms;

    s->s3->tmp.pmslen = pmslen;



    /* Log the premaster secret, if logging is enabled. */

    if (!ssl_log_rsa_client_key_exchange(s, encdata, enclen, pms, pmslen))

        goto err;



    s->s3->tmp.pms = pms;

    s->s3->tmp.pmslen = pmslen;



    return 1;

 err:

    OPENSSL_clear_free(pms, pmslen);