diff options
| author | Matt Caswell <matt@openssl.org> | 2015-12-29 00:17:10 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-01-11 10:03:27 +0000 |
| commit | 1446f72ba3065813cfe008b8f7140551a437b1cf (patch) | |
| tree | 8ff83e7438170d696e4dec98ebc087960b0a7167 | |
| parent | ec04e866343d40a1e3e8e5db79557e279a2dd0d8 (diff) | |
| download | openssl-1446f72ba3065813cfe008b8f7140551a437b1cf.zip openssl-1446f72ba3065813cfe008b8f7140551a437b1cf.tar.gz openssl-1446f72ba3065813cfe008b8f7140551a437b1cf.tar.bz2 | |
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 <viktor@openssl.org>
| -rw-r--r-- | apps/sess_id.c | 5 |
1 files 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: |