diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-10-24 16:31:57 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-10-26 09:43:39 +0100 |
| commit | 22dddfb925da8775eaf4ee8c377da41e6535afe1 (patch) | |
| tree | 86eae67fce686dd241e2540b7b03b42b247f7918 /apps/include/apps.h | |
| parent | b6120b5f5442c3ddd081a9378ec89b888c3bb0fe (diff) | |
APPS: Remove the format argument where it's not used
Also, restore a behaviour change, where load_cert() would look at
stdin when the input file name is NULL, and make sure to call
load_cert_pass() with a corresponding argument where load_cert() was
used in OpenSSL 1.1.1.
Fixes #13235
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13236)
Diffstat (limited to 'apps/include/apps.h')
| -rw-r--r-- | apps/include/apps.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/include/apps.h b/apps/include/apps.h index 8bb92e07db..17e01336ab 100644 --- a/apps/include/apps.h +++ b/apps/include/apps.h @@ -107,9 +107,8 @@ int add_oid_section(CONF *conf); 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 */ -#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); +#define load_cert(uri, desc) load_cert_pass(uri, 1, NULL, desc) +X509_CRL *load_crl(const char *uri, const char *desc); void cleanse(char *str); void clear_free(char *str); EVP_PKEY *load_key(const char *uri, int format, int maybe_stdin, |