Change IMPORTANT to WARNING for greater emphasis.

[openssl.git] / apps / smime.c

diff --git a/apps/smime.c b/apps/smime.c
index ebc0eb6af44c1c22842112a66d6183250d1d1e4e..9467b59befa428e41741f43257d2fddda9c9ccca 100644 (file)
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -141,6 +141,8 @@ int MAIN(int argc, char **argv)
                                flags |= PKCS7_NOATTR;
                else if (!strcmp (*args, "-nodetach")) 
                                flags &= ~PKCS7_DETACHED;
+               else if (!strcmp (*args, "-nosmimecap"))
+                               flags |= PKCS7_NOSMIMECAP;
                else if (!strcmp (*args, "-binary"))
                                flags |= PKCS7_BINARY;
                else if (!strcmp (*args, "-nosigs"))
@@ -277,8 +279,11 @@ int MAIN(int argc, char **argv)
                BIO_printf (bio_err, "-signer file   signer certificate file\n");
                BIO_printf (bio_err, "-recip  file   recipient certificate file for decryption\n");
                BIO_printf (bio_err, "-in file       input file\n");
+               BIO_printf (bio_err, "-inform arg    input format SMIME (default), PEM or DER\n");
                BIO_printf (bio_err, "-inkey file    input private key (if not signer or recipient)\n");
                BIO_printf (bio_err, "-out file      output file\n");
+               BIO_printf (bio_err, "-outform arg   output format SMIME (default), PEM or DER\n");
+               BIO_printf (bio_err, "-content file  supply or override content for detached signature\n");
                BIO_printf (bio_err, "-to addr       to address\n");
                BIO_printf (bio_err, "-from ad       from address\n");
                BIO_printf (bio_err, "-subject s     subject\n");
@@ -388,7 +393,15 @@ int MAIN(int argc, char **argv)
                                 "Can't open output file %s\n", outfile);
                        goto end;
                }
-       } else out = BIO_new_fp(stdout, BIO_NOCLOSE);
+       } else {
+               out = BIO_new_fp(stdout, BIO_NOCLOSE);
+#ifdef VMS
+               {
+                   BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+                   out = BIO_push(tmpbio, out);
+               }
+#endif
+       }
 
        if(operation == SMIME_VERIFY) {
                if(!(store = setup_verify(CAfile, CApath))) goto end;
@@ -485,7 +498,7 @@ end:
        PKCS7_free(p7);
        BIO_free(in);
        BIO_free(indata);
-       BIO_free(out);
+       BIO_free_all(out);
        if(passin) OPENSSL_free(passin);
        return (ret);
 }