have 'openssl pkcs7' exit with code 1 on error instead of 0.

[openssl.git] / apps / pkcs7.c

diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index 0af269007ac71422d352330c80ff0d03ec6125d4..0cced40f0f10a8ea8bb1b527a57bd18ca6c46c8a 100644 (file)
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -82,13 +82,15 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
        {
+       ENGINE *e = NULL;
        PKCS7 *p7=NULL;
        int i,badops=0;
        BIO *in=NULL,*out=NULL;
        int informat,outformat;
        char *infile,*outfile,*prog;
        int print_certs=0,text=0,noout=0;
-       int ret=0;
+       int ret=1;
+       char *engine=NULL;
 
        apps_startup();
 
@@ -132,6 +134,11 @@ int MAIN(int argc, char **argv)
                        text=1;
                else if (strcmp(*argv,"-print_certs") == 0)
                        print_certs=1;
+               else if (strcmp(*argv,"-engine") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       engine= *(++argv);
+                       }
                else
                        {
                        BIO_printf(bio_err,"unknown option %s\n",*argv);
@@ -154,11 +161,15 @@ bad:
                BIO_printf(bio_err," -print_certs  print any certs or crl in the input\n");
                BIO_printf(bio_err," -text         print full details of certificates\n");
                BIO_printf(bio_err," -noout        don't output encoded data\n");
-               EXIT(1);
+               BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
+               ret = 1;
+               goto end;
                }
 
        ERR_load_crypto_strings();
 
+        e = setup_engine(bio_err, engine, 0);
+
        in=BIO_new(BIO_s_file());
        out=BIO_new(BIO_s_file());
        if ((in == NULL) || (out == NULL))
@@ -198,7 +209,7 @@ bad:
        if (outfile == NULL)
                {
                BIO_set_fp(out,stdout,BIO_NOCLOSE);
-#ifdef VMS
+#ifdef OPENSSL_SYS_VMS
                {
                BIO *tmpbio = BIO_new(BIO_f_linebuffer());
                out = BIO_push(tmpbio, out);
@@ -289,5 +300,6 @@ end:
        if (p7 != NULL) PKCS7_free(p7);
        if (in != NULL) BIO_free(in);
        if (out != NULL) BIO_free_all(out);
+       apps_shutdown();
        EXIT(ret);
        }