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/opt.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/opt.c')
-rw-r--r-- | apps/opt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/opt.c b/apps/opt.c index 82ac5a804e..84e8661a93 100644 --- a/apps/opt.c +++ b/apps/opt.c @@ -180,7 +180,7 @@ char *opt_init(int ac, char **av, const OPTIONS *o) switch (i) { case 0: case '-': case '/': case '<': case '>': case 'E': case 'F': case 'M': case 'U': case 'f': case 'l': case 'n': case 'p': case 's': - case 'u': + case 'u': case 'c': break; default: assert(0); @@ -756,10 +756,12 @@ int opt_next(void) return -1; } break; + case 'c': case 'E': case 'F': case 'f': if (opt_format(arg, + o->valtype == 'c' ? OPT_FMT_PDS : o->valtype == 'E' ? OPT_FMT_PDE : o->valtype == 'F' ? OPT_FMT_PEMDER : OPT_FMT_ANY, &ival)) |