diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2012-12-14 23:30:56 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2012-12-14 23:30:56 +0000 |
| commit | 33826fd028a480602ee55faa6c91a347155d3e1e (patch) | |
| tree | 872ddbb5ad7f80d0a8a6c9742c126d8556bbb75f /apps/ocsp.c | |
| parent | 92821996de4a381635f5d048345c3b0f8fe9a30b (diff) | |
Add support for '-' as input and output filenames in ocsp utility.
Recognise verification arguments.
Diffstat (limited to 'apps/ocsp.c')
| -rw-r--r-- | apps/ocsp.c | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/apps/ocsp.c b/apps/ocsp.c index 16aa23b6f6..f5e37a6358 100644 --- a/apps/ocsp.c +++ b/apps/ocsp.c @@ -148,6 +148,7 @@ int MAIN(int argc, char **argv) long nsec = MAX_VALIDITY_PERIOD, maxage = -1; char *CAfile = NULL, *CApath = NULL; X509_STORE *store = NULL; + X509_VERIFY_PARAM *vpm = NULL; STACK_OF(X509) *sign_other = NULL, *verify_other = NULL, *rother = NULL; char *sign_certfile = NULL, *verify_certfile = NULL, *rcertfile = NULL; unsigned long sign_flags = 0, verify_flags = 0, rflags = 0; @@ -356,6 +357,12 @@ int MAIN(int argc, char **argv) } else badarg = 1; } + else if (args_verify(&args, NULL, &badarg, bio_err, &vpm)) + { + if (badarg) + goto end; + continue; + } else if (!strcmp (*args, "-validity_period")) { if (args[1]) @@ -637,7 +644,10 @@ int MAIN(int argc, char **argv) if (!req && reqin) { - derbio = BIO_new_file(reqin, "rb"); + if (!strcmp(reqin, "-")) + derbio = BIO_new_fp(stdin, BIO_NOCLOSE); + else + derbio = BIO_new_file(reqin, "rb"); if (!derbio) { BIO_printf(bio_err, "Error Opening OCSP request file\n"); @@ -739,7 +749,10 @@ int MAIN(int argc, char **argv) if (reqout) { - derbio = BIO_new_file(reqout, "wb"); + if (!strcmp(respout, "-")) + derbio = BIO_new_fp(stdout, BIO_NOCLOSE); + else + derbio = BIO_new_file(reqout, "wb"); if(!derbio) { BIO_printf(bio_err, "Error opening file %s\n", reqout); @@ -782,7 +795,10 @@ int MAIN(int argc, char **argv) } else if (respin) { - derbio = BIO_new_file(respin, "rb"); + if (!strcmp(respin, "-")) + derbio = BIO_new_fp(stdin, BIO_NOCLOSE); + else + derbio = BIO_new_file(respin, "rb"); if (!derbio) { BIO_printf(bio_err, "Error Opening OCSP response file\n"); @@ -807,7 +823,10 @@ int MAIN(int argc, char **argv) if (respout) { - derbio = BIO_new_file(respout, "wb"); + if (!strcmp(respout, "-")) + derbio = BIO_new_fp(stdout, BIO_NOCLOSE); + else + derbio = BIO_new_file(respout, "wb"); if(!derbio) { BIO_printf(bio_err, "Error opening file %s\n", respout); @@ -854,6 +873,8 @@ int MAIN(int argc, char **argv) store = setup_verify(bio_err, CAfile, CApath); if (!store) goto end; + if (vpm) + X509_STORE_set1_param(store, vpm); if (verify_certfile) { verify_other = load_certs(bio_err, verify_certfile, FORMAT_PEM, @@ -904,6 +925,8 @@ end: ERR_print_errors(bio_err); X509_free(signer); X509_STORE_free(store); + if (vpm) + X509_VERIFY_PARAM_free(vpm); EVP_PKEY_free(key); EVP_PKEY_free(rkey); X509_free(issuer); |