From: Dr. David von Oheimb <David.von.Oheimb@siemens.com>
Date: Mon, 5 Jun 2023 20:53:43 +0000 (+0200)
Subject: APPS load_key_certs_crls(): improve error string macro FAIL_NAME
X-Git-Tag: openssl-3.2.0-alpha1~413
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4085ba874ee0f76eda412a8820a379f27664d763;p=thirdparty%2Fopenssl.git

APPS load_key_certs_crls(): improve error string macro FAIL_NAME

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21129)
---

diff --git a/apps/lib/apps.c b/apps/lib/apps.c
index 887fa74dea0..1acc991bb82 100644
--- a/apps/lib/apps.c
+++ b/apps/lib/apps.c
@@ -908,10 +908,10 @@ static const char *format2string(int format)
         SET_EXPECT(val); \
     }
 #define FAIL_NAME \
-    (ppkey != NULL ? "key etc." : ppubkey != NULL ? "public key etc." : \
-     pparams != NULL ? "params etc." :                                  \
-     pcert != NULL ? "cert etc." : pcerts != NULL ? "certs etc." :      \
-     pcrl != NULL ? "CRL etc." : pcrls != NULL ? "CRLs etc." : NULL)
+    (ppkey != NULL ? "private key" : ppubkey != NULL ? "public key" :  \
+     pparams != NULL ? "key parameters" :                              \
+     pcert != NULL ? "certificate" : pcerts != NULL ? "certificates" : \
+     pcrl != NULL ? "CRL" : pcrls != NULL ? "CRLs" : NULL)
 /*
  * Load those types of credentials for which the result pointer is not NULL.
  * Reads from stdio if uri is NULL and maybe_stdin is nonzero.