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/ocsp.c | |
| 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/ocsp.c')
| -rw-r--r-- | apps/ocsp.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/apps/ocsp.c b/apps/ocsp.c index 4d01e99c15..174f237340 100644 --- a/apps/ocsp.c +++ b/apps/ocsp.c @@ -405,8 +405,7 @@ int ocsp_main(int argc, char **argv) path = opt_arg(); break; case OPT_ISSUER: - issuer = load_cert(opt_arg(), FORMAT_UNDEF, - "issuer certificate"); + issuer = load_cert(opt_arg(), "issuer certificate"); if (issuer == NULL) goto end; if (issuers == NULL) { @@ -418,7 +417,7 @@ int ocsp_main(int argc, char **argv) break; case OPT_CERT: X509_free(cert); - cert = load_cert(opt_arg(), FORMAT_UNDEF, "certificate"); + cert = load_cert(opt_arg(), "certificate"); if (cert == NULL) goto end; if (cert_id_md == NULL) @@ -562,8 +561,7 @@ int ocsp_main(int argc, char **argv) if (rsignfile != NULL) { if (rkeyfile == NULL) rkeyfile = rsignfile; - rsigner = load_cert(rsignfile, FORMAT_UNDEF, - "responder certificate"); + rsigner = load_cert(rsignfile, "responder certificate"); if (rsigner == NULL) { BIO_printf(bio_err, "Error loading responder certificate\n"); goto end; @@ -659,7 +657,7 @@ redo_accept: if (signfile != NULL) { if (keyfile == NULL) keyfile = signfile; - signer = load_cert(signfile, FORMAT_UNDEF, "signer certificate"); + signer = load_cert(signfile, "signer certificate"); if (signer == NULL) { BIO_printf(bio_err, "Error loading signer certificate\n"); goto end; |