diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2016-05-12 17:13:50 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-05-13 02:21:56 +0100 |
| commit | f47e5647750d4443cbdd7fc2311f838f0f103112 (patch) | |
| tree | 92b3abfe76db550135fb47f980ea7a2608cd4f35 /apps/cms.c | |
| parent | 3ec8a1cfd8e06e2308fc318d8071aa7b5ddda146 (diff) | |
Fix signer option and support format SMIME.
Fix -signer option in smime utility to output signer certificates
when verifying.
Add support for format SMIME for -inform and -outform with cms and
smime utilities.
PR#4215
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Diffstat (limited to 'apps/cms.c')
| -rw-r--r-- | apps/cms.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/cms.c b/apps/cms.c index 7bc40d5d2f..84cea9d1b3 100644 --- a/apps/cms.c +++ b/apps/cms.c @@ -134,8 +134,8 @@ OPTIONS cms_options[] = { " cert.pem... recipient certs for encryption\n"}, {OPT_HELP_STR, 1, '-', "Valid options are:\n"}, {"help", OPT_HELP, '-', "Display this summary"}, - {"inform", OPT_INFORM, 'F', "Input format SMIME (default), PEM or DER"}, - {"outform", OPT_OUTFORM, 'F', + {"inform", OPT_INFORM, 'c', "Input format SMIME (default), PEM or DER"}, + {"outform", OPT_OUTFORM, 'c', "Output format SMIME (default), PEM or DER"}, {"in", OPT_IN, '<', "Input file"}, {"out", OPT_OUT, '>', "Output file"}, @@ -278,11 +278,11 @@ int cms_main(int argc, char **argv) ret = 0; goto end; case OPT_INFORM: - if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &informat)) + if (!opt_format(opt_arg(), OPT_FMT_PDS, &informat)) goto opthelp; break; case OPT_OUTFORM: - if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &outformat)) + if (!opt_format(opt_arg(), OPT_FMT_PDS, &outformat)) goto opthelp; break; case OPT_OUT: |