summaryrefslogtreecommitdiffstats
path: root/apps/apps.c
diff options
context:
space:
mode:
authorMartin Kaiser <lists@kaiser.cx>2014-05-24 00:02:24 +0100
committerMatt Caswell <matt@openssl.org>2014-05-24 00:02:24 +0100
commit189ae368d91d2c9de5ed1fa21e993f5c83fc4445 (patch)
tree63daed6505f8df3c1baef63a7c92e0d96fa3a9f2 /apps/apps.c
parentdd36fce023a64d90058b8fefbd95dadaca98f9ca (diff)
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/apps.c')
-rw-r--r--apps/apps.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/apps.c b/apps/apps.c
index b82882aa0c..946884860f 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -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'))