diff options
| author | FdaSilvaYY <fdasilvayy@gmail.com> | 2016-09-17 21:29:48 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-09-19 21:21:38 -0400 |
| commit | 28aef3d9558dc2e11ba56576b3a4d3faaef8a9d3 (patch) | |
| tree | a099dc7154b5557cffd7ac4ff9e623ddb205c60a /apps/cms.c | |
| parent | 12d56b2992ebd61e1b30c99ca1898dde42345cf7 (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)
Diffstat (limited to 'apps/cms.c')
| -rw-r--r-- | apps/cms.c | 6 |
1 files changed, 1 insertions, 5 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; |