diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2023-06-05 22:53:43 +0200 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2023-07-17 08:48:26 +1000 |
| commit | 4085ba874ee0f76eda412a8820a379f27664d763 (patch) | |
| tree | a371de9110630b8e897f434ed6830dfbed9a8d6b /apps | |
| parent | f36504cc393e10abd35a8b6a25d8965cddcacf98 (diff) | |
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)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/lib/apps.c | 8 |
1 files 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. |