[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  2c90e80dec299c3307a968ec21838aeabd7bb2c9 (commit)
      from  8b0ec09934a3f76f6d3e83793b5434e76fdd8c2c (commit)


- Log -----------------------------------------------------------------
commit 2c90e80dec299c3307a968ec21838aeabd7bb2c9
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Nov 9 10:48:56 2020 +0000

    Remove some redundant error messages in the apps
    
    We change the load_key() and load_pubkey() functions to make them more
    consistent with the load_keyparams() function modified as a result of
    PR #13317.
    
    The error message on a NULL key is removed, because an error message has
    already been displayed by load_key_certs_crls().
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/13355)

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

Summary of changes:
 apps/lib/apps.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/apps/lib/apps.c b/apps/lib/apps.c
index b1158a9ebc..b790f60992 100644
--- a/apps/lib/apps.c
+++ b/apps/lib/apps.c
@@ -562,10 +562,6 @@ EVP_PKEY *load_key(const char *uri, int format, int may_stdin,
                                   &pkey, NULL, NULL, NULL, NULL, NULL, NULL);
     }
 
-    if (pkey == NULL) {
-        BIO_printf(bio_err, "Unable to load %s\n", desc);
-        ERR_print_errors(bio_err);
-    }
     return pkey;
 }
 
@@ -591,10 +587,7 @@ EVP_PKEY *load_pubkey(const char *uri, int format, int maybe_stdin,
         (void)load_key_certs_crls(uri, maybe_stdin, pass, desc,
                                   NULL, &pkey, NULL, NULL, NULL, NULL, NULL);
     }
-    if (pkey == NULL) {
-        BIO_printf(bio_err, "Unable to load %s\n", desc);
-        ERR_print_errors(bio_err);
-    }
+
     return pkey;
 }