generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix NSS format session output

Browse Source 
Commit 189ae368d91 (RT ticket 3352) provided the capability to output
session key data in NSS format. The big apps cleanup broke that capability.
This commit restores it.

RT#4201

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
This commit is contained in:
Matt Caswell 2015-12-29 00:17:10 +00:00
parent ec04e86634
commit 1446f72ba3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/sess_id.c
View File

@ -74,7 +74,7 @@ typedef enum OPTION_choice {
OPTIONS sess_id_options[] = { OPTIONS sess_id_options[] = {
{"help", OPT_HELP, '-', "Display this summary"}, {"help", OPT_HELP, '-', "Display this summary"},
{"inform", OPT_INFORM, 'F', "Input format - default PEM (DER or PEM)"}, {"inform", OPT_INFORM, 'F', "Input format - default PEM (DER or PEM)"},
{"outform", OPT_OUTFORM, 'F', {"outform", OPT_OUTFORM, 'f',
"Output format - default PEM (PEM, DER or NSS)"}, "Output format - default PEM (PEM, DER or NSS)"},
{"in", OPT_IN, 's', "Input file - default stdin"}, {"in", OPT_IN, 's', "Input file - default stdin"},
{"out", OPT_OUT, 's', "Output file - default stdout"}, {"out", OPT_OUT, 's', "Output file - default stdout"},
@ -114,7 +114,8 @@ int sess_id_main(int argc, char **argv)
goto opthelp; goto opthelp;
break; break;
case OPT_OUTFORM: case OPT_OUTFORM:
if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &outformat)) if (!opt_format(opt_arg(), OPT_FMT_PEMDER | OPT_FMT_NSS,
&outformat))
goto opthelp; goto opthelp;
break; break;
case OPT_IN: case OPT_IN: