Fix signer option and support format SMIME.

[openssl.git] / apps / cms.c

diff --git a/apps/cms.c b/apps/cms.c
index 7bc40d5d2f7515c31086f0597da3a1609cb1859f..84cea9d1b3215acd234840202d4ecd718576f5ea 100644 (file)
--- 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"},
         "  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"},
      "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:
             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:
                 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:
                 goto opthelp;
             break;
         case OPT_OUT: