From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 16 Nov 2016 23:14:30 +0000 (+0000)
Subject: Make MSBLOB format work with dsa utility.
X-Git-Tag: OpenSSL_1_1_0d~117
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1142556755beae2d87c80702158fee50ad29fb48;p=oweals%2Fopenssl.git

Make MSBLOB format work with dsa utility.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit b3795987477f1d478fd8bd20efb812e71b190e8b)
---

diff --git a/apps/dsa.c b/apps/dsa.c
index bfb08e9600..273f8d0856 100644
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -37,7 +37,7 @@ typedef enum OPTION_choice {
 OPTIONS dsa_options[] = {
     {"help", OPT_HELP, '-', "Display this summary"},
     {"inform", OPT_INFORM, 'f', "Input format, DER PEM PVK"},
-    {"outform", OPT_OUTFORM, 'F', "Output format, DER PEM PVK"},
+    {"outform", OPT_OUTFORM, 'f', "Output format, DER PEM PVK"},
     {"in", OPT_IN, 's', "Input key"},
     {"out", OPT_OUT, '>', "Output file"},
     {"noout", OPT_NOOUT, '-', "Don't print key out"},
@@ -96,8 +96,7 @@ int dsa_main(int argc, char **argv)
             infile = opt_arg();
             break;
         case OPT_OUTFORM:
-            if (!opt_format
-                (opt_arg(), OPT_FMT_PEMDER | OPT_FMT_PVK, &outformat))
+            if (!opt_format(opt_arg(), OPT_FMT_ANY, &outformat))
                 goto opthelp;
             break;
         case OPT_OUT: