From 4085ba874ee0f76eda412a8820a379f27664d763 Mon Sep 17 00:00:00 2001 From: "Dr. David von Oheimb" Date: Mon, 5 Jun 2023 22:53:43 +0200 Subject: [PATCH] APPS load_key_certs_crls(): improve error string macro FAIL_NAME Reviewed-by: Tomas Mraz Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/21129) --- apps/lib/apps.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/lib/apps.c b/apps/lib/apps.c index 887fa74dea..1acc991bb8 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.