EXIT() may mean return(). That's confusing, so let's have it really mean
[openssl.git] / apps / pkcs7.c
index 63ec8a5..738dd85 100644 (file)
@@ -67,7 +67,6 @@
 #include <openssl/x509.h>
 #include <openssl/pkcs7.h>
 #include <openssl/pem.h>
-#include <openssl/engine.h>
 
 #undef PROG
 #define PROG   pkcs7_main
@@ -90,7 +89,7 @@ int MAIN(int argc, char **argv)
        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();
@@ -163,28 +162,13 @@ bad:
                BIO_printf(bio_err," -text         print full details of certificates\n");
                BIO_printf(bio_err," -noout        don't output encoded data\n");
                BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
-               EXIT(1);
+               ret = 1;
+               goto end;
                }
 
        ERR_load_crypto_strings();
 
-       if (engine != NULL)
-               {
-               if((e = ENGINE_by_id(engine)) == NULL)
-                       {
-                       BIO_printf(bio_err,"invalid engine \"%s\"\n",
-                               engine);
-                       goto end;
-                       }
-               if(!ENGINE_set_default(e, ENGINE_METHOD_ALL))
-                       {
-                       BIO_printf(bio_err,"can't use that engine\n");
-                       goto end;
-                       }
-               BIO_printf(bio_err,"engine \"%s\" set.\n", engine);
-               /* Free our "structural" reference. */
-               ENGINE_free(e);
-               }
+        e = setup_engine(bio_err, engine, 0);
 
        in=BIO_new(BIO_s_file());
        out=BIO_new(BIO_s_file());
@@ -316,5 +300,6 @@ end:
        if (p7 != NULL) PKCS7_free(p7);
        if (in != NULL) BIO_free(in);
        if (out != NULL) BIO_free_all(out);
-       EXIT(ret);
+       apps_shutdown();
+       OPENSSL_EXIT(ret);
        }