Add minimum POP3 STLS hack to s_client.c (as was provided for STARTTLS before)

[openssl.git] / apps / pkcs7.c

diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index c1973646cd2468761de11f5739fc993af9411491..6c58c67eb27927f146362d1c403b81b234fd6643 100644 (file)
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -71,22 +71,30 @@
 #undef PROG
 #define PROG   pkcs7_main
 
-/* -inform arg - input format - default PEM (one of DER, TXT or PEM)
+/* -inform arg - input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
  * -in arg     - input file - default stdin
  * -out arg    - output file - default stdout
  * -print_certs
  */
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
+#ifndef OPENSSL_NO_ENGINE
+       ENGINE *e = NULL;
+#endif
        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;
+#ifndef OPENSSL_NO_ENGINE
+       char *engine=NULL;
+#endif
 
        apps_startup();
 
@@ -130,6 +138,13 @@ int MAIN(int argc, char **argv)
                        text=1;
                else if (strcmp(*argv,"-print_certs") == 0)
                        print_certs=1;
+#ifndef OPENSSL_NO_ENGINE
+               else if (strcmp(*argv,"-engine") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       engine= *(++argv);
+                       }
+#endif
                else
                        {
                        BIO_printf(bio_err,"unknown option %s\n",*argv);
@@ -145,18 +160,26 @@ int MAIN(int argc, char **argv)
 bad:
                BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
                BIO_printf(bio_err,"where options are\n");
-               BIO_printf(bio_err," -inform arg   input format - one of DER TXT PEM\n");
-               BIO_printf(bio_err," -outform arg  output format - one of DER TXT PEM\n");
+               BIO_printf(bio_err," -inform arg   input format - DER or PEM\n");
+               BIO_printf(bio_err," -outform arg  output format - DER or PEM\n");
                BIO_printf(bio_err," -in arg       input file\n");
                BIO_printf(bio_err," -out arg      output file\n");
                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);
+#ifndef OPENSSL_NO_ENGINE
+               BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
+#endif
+               ret = 1;
+               goto end;
                }
 
        ERR_load_crypto_strings();
 
+#ifndef OPENSSL_NO_ENGINE
+        e = setup_engine(bio_err, engine, 0);
+#endif
+
        in=BIO_new(BIO_s_file());
        out=BIO_new(BIO_s_file());
        if ((in == NULL) || (out == NULL))
@@ -194,7 +217,15 @@ bad:
                }
 
        if (outfile == NULL)
+               {
                BIO_set_fp(out,stdout,BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
+               {
+               BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+               out = BIO_push(tmpbio, out);
+               }
+#endif
+               }
        else
                {
                if (BIO_write_filename(out,outfile) <= 0)
@@ -278,6 +309,7 @@ bad:
 end:
        if (p7 != NULL) PKCS7_free(p7);
        if (in != NULL) BIO_free(in);
-       if (out != NULL) BIO_free(out);
-       EXIT(ret);
+       if (out != NULL) BIO_free_all(out);
+       apps_shutdown();
+       OPENSSL_EXIT(ret);
        }