diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-08-16 15:25:27 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-08-20 14:55:52 +0200 |
| commit | 2a33470b4f23bcf1cd66bbf645c855142efa0ed9 (patch) | |
| tree | 5b739438019058a19ede7530679a1b4fd4e75b3c /apps/include | |
| parent | b3c5aadf4ce3dc2207cc605726bf370a55b531c9 (diff) | |
Make better use of new load_cert_pass() variant of load_cert() in apps/
allows loading password-protected PKCS#12 files in x509, ca, s_client, s_server
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12647)
Diffstat (limited to 'apps/include')
| -rw-r--r-- | apps/include/apps.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/include/apps.h b/apps/include/apps.h index 0f00e9f52a..8d1eb7c280 100644 --- a/apps/include/apps.h +++ b/apps/include/apps.h @@ -105,7 +105,7 @@ X509_REQ *load_csr(const char *file, int format, const char *desc); X509 *load_cert_pass(const char *uri, int maybe_stdin, const char *pass, const char *desc); /* the format parameter is meanwhile not needed anymore and thus ignored */ -X509 *load_cert(const char *uri, int format, const char *desc); +#define load_cert(uri, format, desc) load_cert_pass(uri, 0, NULL, desc) X509_CRL *load_crl(const char *uri, int format, const char *desc); void cleanse(char *str); void clear_free(char *str); |