Add support for '-' as input and output filenames in ocsp utility.

[openssl.git] / apps / ocsp.c

diff --git a/apps/ocsp.c b/apps/ocsp.c
index 16aa23b6f6cc078adc413bb53e9656a3f33115cb..f5e37a6358f44aca1fc4c955a7effe47d1565831 100644 (file)
--- 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;
        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;
        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 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])
                else if (!strcmp (*args, "-validity_period"))
                        {
                        if (args[1])


@@ -637,7 +644,10 @@ int MAIN(int argc, char **argv)
 
        if (!req && reqin)
                {
 
        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");
                if (!derbio)
                        {
                        BIO_printf(bio_err, "Error Opening OCSP request file\n");


@@ -739,7 +749,10 @@ int MAIN(int argc, char **argv)
 
        if (reqout)
                {
 
        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);
                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)
                {
                }
        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");
                if (!derbio)
                        {
                        BIO_printf(bio_err, "Error Opening OCSP response file\n");


@@ -807,7 +823,10 @@ int MAIN(int argc, char **argv)
 
        if (respout)
                {
 
        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);
                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;
                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,
        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);
        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);
        EVP_PKEY_free(key);
        EVP_PKEY_free(rkey);
        X509_free(issuer);