From 1446f72ba3065813cfe008b8f7140551a437b1cf Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 29 Dec 2015 00:17:10 +0000 Subject: Fix NSS format session output 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 --- apps/sess_id.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'apps/sess_id.c') diff --git a/apps/sess_id.c b/apps/sess_id.c index 39711e2..2be2692 100644 --- a/apps/sess_id.c +++ b/apps/sess_id.c @@ -74,7 +74,7 @@ typedef enum OPTION_choice { OPTIONS sess_id_options[] = { {"help", OPT_HELP, '-', "Display this summary"}, {"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)"}, {"in", OPT_IN, 's', "Input file - default stdin"}, {"out", OPT_OUT, 's', "Output file - default stdout"}, @@ -114,7 +114,8 @@ int sess_id_main(int argc, char **argv) goto opthelp; break; 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; break; case OPT_IN: -- cgit v1.1