提交 b3795987 编写于 作者: D Dr. Stephen Henson

Make MSBLOB format work with dsa utility.

Reviewed-by: NRich Salz <rsalz@openssl.org>
上级 159f6e7e
...@@ -37,7 +37,7 @@ typedef enum OPTION_choice { ...@@ -37,7 +37,7 @@ typedef enum OPTION_choice {
const OPTIONS dsa_options[] = { const OPTIONS dsa_options[] = {
{"help", OPT_HELP, '-', "Display this summary"}, {"help", OPT_HELP, '-', "Display this summary"},
{"inform", OPT_INFORM, 'f', "Input format, DER PEM PVK"}, {"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"}, {"in", OPT_IN, 's', "Input key"},
{"out", OPT_OUT, '>', "Output file"}, {"out", OPT_OUT, '>', "Output file"},
{"noout", OPT_NOOUT, '-', "Don't print key out"}, {"noout", OPT_NOOUT, '-', "Don't print key out"},
...@@ -96,8 +96,7 @@ int dsa_main(int argc, char **argv) ...@@ -96,8 +96,7 @@ int dsa_main(int argc, char **argv)
infile = opt_arg(); infile = opt_arg();
break; break;
case OPT_OUTFORM: case OPT_OUTFORM:
if (!opt_format if (!opt_format(opt_arg(), OPT_FMT_ANY, &outformat))
(opt_arg(), OPT_FMT_PEMDER | OPT_FMT_PVK, &outformat))
goto opthelp; goto opthelp;
break; break;
case OPT_OUT: case OPT_OUT:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册