The branch master has been updated
via 1446f72ba3065813cfe008b8f7140551a437b1cf (commit)
from ec04e866343d40a1e3e8e5db79557e279a2dd0d8 (commit)
- Log -----------------------------------------------------------------
commit 1446f72ba3065813cfe008b8f7140551a437b1cf
Author: Matt Caswell <[email protected]>
Date: Tue Dec 29 00:17:10 2015 +0000
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 <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
apps/sess_id.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
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:
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
