[openssl] master update

[tmraz at fedoraproject.org]

The branch master has been updated
       via  28e1904250183c25faad1744fead96f205559270 (commit)
      from  963a65bfb41562909d1800339f7b1e3cfc0a39bf (commit)


- Log -----------------------------------------------------------------
commit 28e1904250183c25faad1744fead96f205559270
Author: Tomas Mraz <tomas at openssl.org>
Date:   Mon Feb 1 15:15:43 2021 +0100

    apps/ecparam: Avoid crash when parameters fail to load
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14043)

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

Summary of changes:
 apps/ecparam.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/ecparam.c b/apps/ecparam.c
index 33b24781e3..762da3f2c9 100644
--- a/apps/ecparam.c
+++ b/apps/ecparam.c
@@ -238,7 +238,7 @@ int ecparam_main(int argc, char **argv)
         }
     } else {
         params_key = load_keyparams(infile, 1, "EC", "EC parameters");
-        if (!EVP_PKEY_is_a(params_key, "EC"))
+        if (params_key == NULL || !EVP_PKEY_is_a(params_key, "EC"))
             goto end;
         if (point_format
             && !EVP_PKEY_set_utf8_string_param(