Move the definition of Win32_rename(), since the macro rename gets undefined

[openssl.git] / apps / smime.c

diff --git a/apps/smime.c b/apps/smime.c
index 83daa71ca19d47f97a9153d2af9414773c83fa30..418e03cd66dbb5c7ac7e5a144ed5d6ca72ce9c54 100644 (file)
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -168,6 +168,10 @@ int MAIN(int argc, char **argv)
                                flags |= PKCS7_BINARY;
                else if (!strcmp (*args, "-nosigs"))
                                flags |= PKCS7_NOSIGS;
+               else if (!strcmp (*args, "-nooldmime"))
+                               flags |= PKCS7_NOOLDMIMETYPE;
+               else if (!strcmp (*args, "-crlfeol"))
+                               flags |= PKCS7_CRLFEOL;
                else if (!strcmp (*args, "-crl_check"))
                                store_flags |= X509_V_FLAG_CRL_CHECK;
                else if (!strcmp (*args, "-crl_check_all"))
@@ -482,10 +486,10 @@ int MAIN(int argc, char **argv)
                 * signing.
                 */
                if ((flags & PKCS7_DETACHED) && (outformat == FORMAT_SMIME))
-                       flags |= PKCS7_PARTSIGN;
+                       flags |= PKCS7_STREAM;
                p7 = PKCS7_sign(signer, key, other, in, flags);
                /* Don't need to rewind for partial signing */
-               if (!(flags & PKCS7_PARTSIGN) && (BIO_reset(in) != 0)) {
+               if (!(flags & PKCS7_STREAM) && (BIO_reset(in) != 0)) {
                  BIO_printf(bio_err, "Can't rewind input file\n");
                  goto end;
                }