[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  61bef9bde09dc6099a7c59baa79898e3b003fec3 (commit)
      from  83e4533a71c5c78278e9763552a5e5f1806473ee (commit)


- Log -----------------------------------------------------------------
commit 61bef9bde09dc6099a7c59baa79898e3b003fec3
Author: Mansour Ahmadi <m.ahmadi at northeastern.edu>
Date:   Mon Oct 15 15:11:24 2018 -0400

    Add a missing check on s->s3->tmp.pkey
    
    Reviewed-by: Paul Yang <yang.yang at baishancloud.com>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7405)

-----------------------------------------------------------------------

Summary of changes:
 ssl/statem/statem_srvr.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 95f83c8..ac5fd09 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -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,