Commit 189ae368 authored by Martin Kaiser's avatar Martin Kaiser Committed by Matt Caswell
Browse files

Add an NSS output format to sess_id to export to export the session id and the... 

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
parent dd36fce0

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,10 @@ 


 Changes between 1.0.2 and 1.1.0  [xx XXX xxxx]



  *) New output format NSS in the sess_id command line tool. This allows

     exporting the session id and the master key in NSS keylog format.

     [Martin Kaiser <martin@kaiser.cx>]



  *) Harmonize version and its documentation. -f flag is used to display

     compilation flags.

     [mancha <mancha1@zoho.com>]

apps/apps.c

+2 −0
Original line number Diff line number Diff line
@@ -263,6 +263,8 @@ int str2fmt(char *s) 
		return(FORMAT_ASN1);

	else if ((*s == 'T') || (*s == 't'))

		return(FORMAT_TEXT);

	else if ((strcmp(s,"NSS") == 0) || (strcmp(s,"nss") == 0))

		return(FORMAT_NSS);

  	else if ((*s == 'N') || (*s == 'n'))

  		return(FORMAT_NETSCAPE);

  	else if ((*s == 'S') || (*s == 's'))

apps/apps.h

+1 −0
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ void store_setup_crl_download(X509_STORE *st); 
#define FORMAT_MSBLOB	11	/* MS Key blob format */

#define FORMAT_PVK	12	/* MS PVK file format */

#define FORMAT_HTTP	13	/* Download using HTTP */

#define FORMAT_NSS	14	/* NSS keylog format */



#define EXT_COPY_NONE	0

#define EXT_COPY_ADD	1

apps/sess_id.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

doc/apps/sess_id.pod

+5 −4
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ sess_id - SSL/TLS session handling utility 


B<openssl> B<sess_id>

[B<-inform PEM|DER>]

[B<-outform PEM|DER>]

[B<-outform PEM|DER|NSS>]

[B<-in filename>]

[B<-out filename>]

[B<-text>]
@@ -33,10 +33,11 @@ format containing session details. The precise format can vary from one version 
to the next.  The B<PEM> form is the default format: it consists of the B<DER>

format base64 encoded with additional header and footer lines.



=item B<-outform DER|PEM>

=item B<-outform DER|PEM|NSS>



This specifies the output format, the options have the same meaning as the 

B<-inform> option.

This specifies the output format. The B<PEM> and B<DER> options have the same meaning

as the B<-inform> option. The B<NSS> option outputs the session id and the master key

in NSS keylog format.



=item B<-in filename>