Commit a6823657 authored by Matt Caswell's avatar Matt Caswell
Browse files

Check the return from EVP_PKEY_get0_DH() 



Fixes #5934

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5983)
parent 7d4488bb

ssl/statem/statem_srvr.c

+6 −0
Original line number Diff line number Diff line
@@ -2481,6 +2481,12 @@ int tls_construct_server_key_exchange(SSL *s, WPACKET *pkt) 
        }



        dh = EVP_PKEY_get0_DH(s->s3->tmp.pkey);

        if (dh == NULL) {

            SSLfatal(s, SSL_AD_INTERNAL_ERROR,

                     SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE,

                     ERR_R_INTERNAL_ERROR);

            goto err;

        }



        EVP_PKEY_free(pkdh);

        pkdh = NULL;