X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=apps%2Fsmime.c;h=418e03cd66dbb5c7ac7e5a144ed5d6ca72ce9c54;hb=fd836aeee017d4c7fef8e4d21afa07081e815be2;hp=83daa71ca19d47f97a9153d2af9414773c83fa30;hpb=27068df7e05d5d3cadd4b0f10762b32cf8b01beb;p=oweals%2Fopenssl.git

diff --git a/apps/smime.c b/apps/smime.c
index 83daa71ca1..418e03cd66 100644
--- 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;
 		}