diff options
| author | FdaSilvaYY <fdasilvayy@gmail.com> | 2016-09-17 21:29:48 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-09-19 21:28:09 -0400 |
| commit | 3fd181a8b5b85a1f7383e82438da494a08f7d843 (patch) | |
| tree | 500e47ad46528ccd85919af2dbdf96dbf03c577d | |
| parent | 90edd7ad0fb0d8b1eb5bb6d587a6359f17a39230 (diff) | |
Remove an option related to a deprecated flag
CMS_NOOLDMIMETYPE and PKCS7_NOOLDMIMETYPE are unused in pkcs7/cms code.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1585)
(cherry picked from commit 28aef3d9558dc2e11ba56576b3a4d3faaef8a9d3)
| -rw-r--r-- | apps/cms.c | 6 | ||||
| -rw-r--r-- | apps/smime.c | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/apps/cms.c b/apps/cms.c index ad292f5137..133dc021ae 100644 --- a/apps/cms.c +++ b/apps/cms.c @@ -72,7 +72,7 @@ typedef enum OPTION_choice { OPT_ASCIICRLF, OPT_NOINTERN, OPT_NOVERIFY, OPT_NOCERTS, OPT_NOATTR, OPT_NODETACH, OPT_NOSMIMECAP, OPT_BINARY, OPT_KEYID, OPT_NOSIGS, OPT_NO_CONTENT_VERIFY, OPT_NO_ATTR_VERIFY, OPT_INDEF, - OPT_NOINDEF, OPT_NOOLDMIME, OPT_CRLFEOL, OPT_NOOUT, OPT_RR_PRINT, + OPT_NOINDEF, OPT_CRLFEOL, OPT_NOOUT, OPT_RR_PRINT, OPT_RR_ALL, OPT_RR_FIRST, OPT_RCTFORM, OPT_CERTFILE, OPT_CAFILE, OPT_CAPATH, OPT_NOCAPATH, OPT_NOCAFILE,OPT_CONTENT, OPT_PRINT, OPT_SECRETKEY, OPT_SECRETKEYID, OPT_PWRI_PASSWORD, OPT_ECONTENT_TYPE, @@ -131,7 +131,6 @@ OPTIONS cms_options[] = { {"stream", OPT_INDEF, '-', "Enable CMS streaming"}, {"indef", OPT_INDEF, '-', "Same as -stream"}, {"noindef", OPT_NOINDEF, '-', "Disable CMS streaming"}, - {"nooldmime", OPT_NOOLDMIME, '-'}, {"crlfeol", OPT_CRLFEOL, '-', "Use CRLF as EOL termination instead of CR only" }, {"noout", OPT_NOOUT, '-', "For the -cmsout operation do not output the parsed CMS structure"}, {"receipt_request_print", OPT_RR_PRINT, '-', "Print CMS Receipt Request" }, @@ -347,9 +346,6 @@ int cms_main(int argc, char **argv) case OPT_NOINDEF: flags &= ~CMS_STREAM; break; - case OPT_NOOLDMIME: - flags |= CMS_NOOLDMIMETYPE; - break; case OPT_CRLFEOL: mime_eol = "\r\n"; flags |= CMS_CRLFEOL; diff --git a/apps/smime.c b/apps/smime.c index 082109b73c..1f4091fa99 100644 --- a/apps/smime.c +++ b/apps/smime.c @@ -37,7 +37,7 @@ typedef enum OPTION_choice { OPT_PK7OUT, OPT_TEXT, OPT_NOINTERN, OPT_NOVERIFY, OPT_NOCHAIN, OPT_NOCERTS, OPT_NOATTR, OPT_NODETACH, OPT_NOSMIMECAP, OPT_BINARY, OPT_NOSIGS, OPT_STREAM, OPT_INDEF, OPT_NOINDEF, - OPT_NOOLDMIME, OPT_CRLFEOL, OPT_RAND, OPT_ENGINE, OPT_PASSIN, + OPT_CRLFEOL, OPT_RAND, OPT_ENGINE, OPT_PASSIN, OPT_TO, OPT_FROM, OPT_SUBJECT, OPT_SIGNER, OPT_RECIP, OPT_MD, OPT_CIPHER, OPT_INKEY, OPT_KEYFORM, OPT_CERTFILE, OPT_CAFILE, OPT_V_ENUM, @@ -95,7 +95,6 @@ OPTIONS smime_options[] = { {"stream", OPT_STREAM, '-', "Enable CMS streaming" }, {"indef", OPT_INDEF, '-', "Same as -stream" }, {"noindef", OPT_NOINDEF, '-', "Disable CMS streaming"}, - {"nooldmime", OPT_NOOLDMIME, '-', NULL}, {"crlfeol", OPT_CRLFEOL, '-', "Use CRLF as EOL termination instead of CR only"}, {"rand", OPT_RAND, 's', "Load the file(s) into the random number generator"}, @@ -221,9 +220,6 @@ int smime_main(int argc, char **argv) case OPT_NOINDEF: indef = 0; break; - case OPT_NOOLDMIME: - flags |= PKCS7_NOOLDMIMETYPE; - break; case OPT_CRLFEOL: flags |= PKCS7_CRLFEOL; mime_eol = "\r\n"; |