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 #21129)
openssl · Jul 16, 2023 · 4085ba8 · 4085ba8
1 parent f36504c
commit 4085ba8
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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.