[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  ab5c77b4766e0992751d86560193ca42b49cf316 (commit)
      from  9bada854de16bcc1a9dc199b4b352b19ab6897fc (commit)


- Log -----------------------------------------------------------------
commit ab5c77b4766e0992751d86560193ca42b49cf316
Author: Pauli <paul.dale at oracle.com>
Date:   Wed Nov 20 13:14:39 2019 +1000

    EVP p_lib: Add NULL check to EVP_PKEY_missing_parameters.
    
    Check for NULL and return error if so.
    This can possibly be called from apps/ca.c with a NULL argument.
    
    Reviewed-by: Paul Yang <kaishen.yy at antfin.com>
    (Merged from https://github.com/openssl/openssl/pull/10474)

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

Summary of changes:
 crypto/evp/p_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index 0e93786c82..759fb95401 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -105,7 +105,7 @@ int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
 
 int EVP_PKEY_missing_parameters(const EVP_PKEY *pkey)
 {
-    if (pkey->ameth && pkey->ameth->param_missing)
+    if (pkey != NULL && pkey->ameth && pkey->ameth->param_missing)
         return pkey->ameth->param_missing(pkey);
     return 0;
 }