[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  a68236572850a1f50d5c40990b5a15a18ebea3bc (commit)
      from  7d4488bbd7ac34fffb776cccbfff6b4ac0387e03 (commit)


- Log -----------------------------------------------------------------
commit a68236572850a1f50d5c40990b5a15a18ebea3bc
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Apr 17 11:32:20 2018 +0100

    Check the return from EVP_PKEY_get0_DH()
    
    Fixes #5934
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5983)

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

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 7e033ce..aa38fad 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -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;