Fix signer option and support format SMIME.

[openssl.git] / apps / opt.c

diff --git a/apps/opt.c b/apps/opt.c
index 82ac5a804e01f51105c352123951139acee49ac8..84e8661a93fbbbc759e9ca9cdf7db77f1e3f587b 100644 (file)
--- 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))