Commit 72a859c9 authored by Mansour Ahmadi's avatar Mansour Ahmadi Committed by Matt Caswell
Browse files

Add a missing check on s->s3->tmp.pkey 



Reviewed-by: default avatarPaul Yang <yang.yang@baishancloud.com>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7405)

(cherry picked from commit 61bef9bde09dc6099a7c59baa79898e3b003fec3)
parent 391f76f1

ssl/statem/statem_srvr.c

+6 −0
Original line number Diff line number Diff line
@@ -3224,6 +3224,12 @@ static int tls_process_cke_ecdhe(SSL *s, PACKET *pkt) 
                     SSL_R_LENGTH_MISMATCH);

            goto err;

        }

        if (skey == NULL) {

            SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PROCESS_CKE_ECDHE,

                     SSL_R_MISSING_TMP_ECDH_KEY);

            goto err;

        }



        ckey = EVP_PKEY_new();

        if (ckey == NULL || EVP_PKEY_copy_parameters(ckey, skey) <= 0) {

            SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PROCESS_CKE_ECDHE,