diff options
author | Tomas Mraz <tomas@openssl.org> | 2021-03-05 21:05:35 +0100 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2021-03-15 13:29:57 +0100 |
commit | ea51096e51571b0dfe1e9e63661ad6f62ce0d82a (patch) | |
tree | 58e1c359aaa08b76d7abf971e6c97d009da0e1b7 /apps/ocsp.c | |
parent | 8287a4c3b2230f8df109f5eb34171fa0058add2c (diff) |
apps: Add maybe_stdin argument to load_certs and set it in pkcs12
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14449)
Diffstat (limited to 'apps/ocsp.c')
-rw-r--r-- | apps/ocsp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/ocsp.c b/apps/ocsp.c index e61774a8a3..e77c90f041 100644 --- a/apps/ocsp.c +++ b/apps/ocsp.c @@ -574,10 +574,10 @@ int ocsp_main(int argc, char **argv) BIO_printf(bio_err, "Error loading responder certificate\n"); goto end; } - if (!load_certs(rca_filename, &rca_cert, NULL, "CA certificates")) + if (!load_certs(rca_filename, 0, &rca_cert, NULL, "CA certificates")) goto end; if (rcertfile != NULL) { - if (!load_certs(rcertfile, &rother, NULL, + if (!load_certs(rcertfile, 0, &rother, NULL, "responder other certificates")) goto end; } @@ -671,7 +671,7 @@ redo_accept: goto end; } if (sign_certfile != NULL) { - if (!load_certs(sign_certfile, &sign_other, NULL, + if (!load_certs(sign_certfile, 0, &sign_other, NULL, "signer certificates")) goto end; } @@ -780,7 +780,7 @@ redo_accept: if (vpmtouched) X509_STORE_set1_param(store, vpm); if (verify_certfile != NULL) { - if (!load_certs(verify_certfile, &verify_other, NULL, + if (!load_certs(verify_certfile, 0, &verify_other, NULL, "validator certificates")) goto end; } |