mirror of
https://github.com/openssl/openssl.git
synced 2025-02-17 14:32:04 +08:00
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)
This commit is contained in:
parent
f36504cc39
commit
4085ba874e
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user