diff options
| author | Viktor Dukhovni <openssl-users@dukhovni.org> | 2016-01-16 00:08:38 -0500 |
|---|---|---|
| committer | Viktor Dukhovni <openssl-users@dukhovni.org> | 2016-01-20 19:04:26 -0500 |
| commit | 0996dc5440cc233f029129182bbb6e3d4613045a (patch) | |
| tree | 7b54822da3319212fc52d6b9e1d463c770fa0495 /apps/ocsp.c | |
| parent | 6e8beabcd4b9450a3a7358bf5668b2bc70580517 (diff) | |
| download | openssl-new-0996dc5440cc233f029129182bbb6e3d4613045a.tar.gz | |
Refactor apps load_certs/load_crls to work incrementally
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'apps/ocsp.c')
| -rw-r--r-- | apps/ocsp.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/apps/ocsp.c b/apps/ocsp.c index 0c41c4d5de..d2e3109630 100644 --- a/apps/ocsp.c +++ b/apps/ocsp.c @@ -533,9 +533,8 @@ int ocsp_main(int argc, char **argv) rca_cert = load_cert(rca_filename, FORMAT_PEM, NULL, NULL, "CA certificate"); if (rcertfile) { - rother = load_certs(rcertfile, FORMAT_PEM, - NULL, NULL, "responder other certificates"); - if (!rother) + if (!load_certs(rcertfile, &rother, FORMAT_PEM, NULL, NULL, + "responder other certificates")) goto end; } rkey = load_key(rkeyfile, FORMAT_PEM, 0, NULL, NULL, @@ -578,9 +577,8 @@ int ocsp_main(int argc, char **argv) goto end; } if (sign_certfile) { - sign_other = load_certs(sign_certfile, FORMAT_PEM, - NULL, NULL, "signer certificates"); - if (!sign_other) + if (!load_certs(sign_certfile, &sign_other, FORMAT_PEM, NULL, NULL, + "signer certificates")) goto end; } key = load_key(keyfile, FORMAT_PEM, 0, NULL, NULL, @@ -702,9 +700,8 @@ int ocsp_main(int argc, char **argv) if (vpmtouched) X509_STORE_set1_param(store, vpm); if (verify_certfile) { - verify_other = load_certs(verify_certfile, FORMAT_PEM, - NULL, NULL, "validator certificate"); - if (!verify_other) + if (!load_certs(verify_certfile, &verify_other, FORMAT_PEM, NULL, NULL, + "validator certificate")) goto end; } |