[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  48fad58f7b170ee9b81231d6aa65d39e13fbe09b (commit)
      from  50864bd2f7bcbc76cb68c46c4f4c6ce57c683a5f (commit)


- Log -----------------------------------------------------------------
commit 48fad58f7b170ee9b81231d6aa65d39e13fbe09b
Author: Tomas Mraz <tomas at openssl.org>
Date:   Mon Mar 15 13:53:10 2021 +0100

    apps/crl: Print just the hash value if printing just hash
    
    This partially reverts the output format change for
    openssl crl -hash output.
    
    Fixes #14546
    
    Reviewed-by: David von Oheimb <david.von.oheimb at siemens.com>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14553)

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

Summary of changes:
 apps/crl.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/crl.c b/apps/crl.c
index 1f12e24a4b..e2ed9588e6 100644
--- a/apps/crl.c
+++ b/apps/crl.c
@@ -308,15 +308,19 @@ int crl_main(int argc, char **argv)
                     X509_NAME_hash_ex(X509_CRL_get_issuer(x), app_get0_libctx(),
                                       app_get0_propq(), &ok);
 
-                BIO_printf(bio_out, "issuer name hash=");
-                if (ok)
+                if (num > 1)
+                    BIO_printf(bio_out, "issuer name hash=");
+                if (ok) {
                     BIO_printf(bio_out, "%08lx\n", hash_value);
-                else
+                } else {
                     BIO_puts(bio_out, "<ERROR>");
+                    goto end;
+                }
             }
 #ifndef OPENSSL_NO_MD5
             if (hash_old == i) {
-                BIO_printf(bio_out, "issuer name old hash=");
+                if (num > 1)
+                    BIO_printf(bio_out, "issuer name old hash=");
                 BIO_printf(bio_out, "%08lx\n",
                            X509_NAME_hash_old(X509_CRL_get_issuer(x)));
             }