diff options
author | Martin Kaiser <lists@kaiser.cx> | 2014-05-24 00:02:24 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2014-05-24 00:02:24 +0100 |
commit | 189ae368d91d2c9de5ed1fa21e993f5c83fc4445 (patch) | |
tree | 63daed6505f8df3c1baef63a7c92e0d96fa3a9f2 /apps/sess_id.c | |
parent | dd36fce023a64d90058b8fefbd95dadaca98f9ca (diff) | |
download | openssl-new-189ae368d91d2c9de5ed1fa21e993f5c83fc4445.tar.gz |
Add an NSS output format to sess_id to export to export the session id and the master key in NSS keylog format. PR#3352
Diffstat (limited to 'apps/sess_id.c')
-rw-r--r-- | apps/sess_id.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/sess_id.c b/apps/sess_id.c index b16686c26d..d4bf1afe2d 100644 --- a/apps/sess_id.c +++ b/apps/sess_id.c @@ -73,7 +73,7 @@ static const char *sess_id_usage[]={ "usage: sess_id args\n", "\n", " -inform arg - input format - default PEM (DER or PEM)\n", -" -outform arg - output format - default PEM\n", +" -outform arg - output format - default PEM (PEM, DER or NSS)\n", " -in arg - input file - default stdin\n", " -out arg - output file - default stdout\n", " -text - print ssl session id details\n", @@ -246,6 +246,8 @@ bad: i=i2d_SSL_SESSION_bio(out,x); else if (outformat == FORMAT_PEM) i=PEM_write_bio_SSL_SESSION(out,x); + else if (outformat == FORMAT_NSS) + i=SSL_SESSION_print_keylog(out,x); else { BIO_printf(bio_err,"bad output format specified for outfile\n"); goto end; |