[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  f5e23fe88904fb5309e5b199bf5254b06dd4f883 (commit)
       via  0808a75e4db421f0f33d866b0abfe10db4f472f2 (commit)
      from  09527c493596060544bda92ecd0d8ef40a366c5e (commit)


- Log -----------------------------------------------------------------
commit f5e23fe88904fb5309e5b199bf5254b06dd4f883
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri May 22 19:09:45 2020 +0200

    APPS: Remove unnecessary NULL check of uri in load_cert_pass()
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/11873)

commit 0808a75e4db421f0f33d866b0abfe10db4f472f2
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue May 19 15:56:18 2020 +0200

    APPS: Make it possible to load_cert() from stdin again
    
    Fixes #11871
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/11873)

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

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

diff --git a/apps/lib/apps.c b/apps/lib/apps.c
index 087ef4ec84..6fd27c3665 100644
--- a/apps/lib/apps.c
+++ b/apps/lib/apps.c
@@ -438,10 +438,6 @@ X509 *load_cert_pass(const char *uri, int maybe_stdin,
 
     if (desc == NULL)
         desc = "certificate";
-    if (uri == NULL) {
-        unbuffer(stdin);
-        uri = "";
-    }
     (void)load_key_cert_crl(uri, maybe_stdin, pass, desc, NULL, &cert, NULL);
     if (cert == NULL) {
         BIO_printf(bio_err, "Unable to load %s\n", desc);
@@ -453,7 +449,7 @@ X509 *load_cert_pass(const char *uri, int maybe_stdin,
 /* the format parameter is meanwhile not needed anymore and thus ignored */
 X509 *load_cert(const char *uri, int format, const char *desc)
 {
-    return load_cert_pass(uri, 0, NULL, desc);
+    return load_cert_pass(uri, 1, NULL, desc);
 }
 
 /* the format parameter is meanwhile not needed anymore and thus ignored */