summaryrefslogtreecommitdiff
path: root/security/nss/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'security/nss/cmd')
-rw-r--r--security/nss/cmd/lib/secutil.c5
-rw-r--r--security/nss/cmd/selfserv/selfserv.c4
-rw-r--r--security/nss/cmd/signver/pk7print.c1
-rw-r--r--security/nss/cmd/strsclnt/strsclnt.c4
-rw-r--r--security/nss/cmd/tstclnt/tstclnt.c4
5 files changed, 10 insertions, 8 deletions
diff --git a/security/nss/cmd/lib/secutil.c b/security/nss/cmd/lib/secutil.c
index 4fda3703b..5556a55ac 100644
--- a/security/nss/cmd/lib/secutil.c
+++ b/security/nss/cmd/lib/secutil.c
@@ -1719,10 +1719,11 @@ SECU_PrintExtensions(FILE *out, CERTCertExtension **extensions,
void
SECU_PrintName(FILE *out, CERTName *name, char *msg, int level)
{
+ char *nameStr;
char *str;
SECItem my;
- str = CERT_NameToAscii(name);
+ str = nameStr = CERT_NameToAscii(name);
if (!str)
str = "!Invalid AVA!";
my.data = (unsigned char *)str;
@@ -1734,7 +1735,7 @@ SECU_PrintName(FILE *out, CERTName *name, char *msg, int level)
fprintf(out, str);
secu_Newline(out);
#endif
- PORT_Free(str);
+ PORT_Free(nameStr);
}
void
diff --git a/security/nss/cmd/selfserv/selfserv.c b/security/nss/cmd/selfserv/selfserv.c
index d10b1dc04..f223c71c6 100644
--- a/security/nss/cmd/selfserv/selfserv.c
+++ b/security/nss/cmd/selfserv/selfserv.c
@@ -381,11 +381,11 @@ printSecurityInfo(PRFileDesc *fd)
char * sp = CERT_NameToAscii(&cert->subject);
if (sp) {
FPRINTF(stderr, "selfserv: subject DN: %s\n", sp);
- PR_Free(sp);
+ PORT_Free(sp);
}
if (ip) {
FPRINTF(stderr, "selfserv: issuer DN: %s\n", ip);
- PR_Free(ip);
+ PORT_Free(ip);
}
CERT_DestroyCertificate(cert);
cert = NULL;
diff --git a/security/nss/cmd/signver/pk7print.c b/security/nss/cmd/signver/pk7print.c
index d29ed6345..2b19df1d1 100644
--- a/security/nss/cmd/signver/pk7print.c
+++ b/security/nss/cmd/signver/pk7print.c
@@ -214,6 +214,7 @@ sv_PrintName(FILE *out, CERTName *name, char *msg)
str = CERT_NameToAscii(name);
fprintf(out, "%s%s\n", msg, str);
+ PORT_Free(str);
}
diff --git a/security/nss/cmd/strsclnt/strsclnt.c b/security/nss/cmd/strsclnt/strsclnt.c
index 3892db9c5..81972d139 100644
--- a/security/nss/cmd/strsclnt/strsclnt.c
+++ b/security/nss/cmd/strsclnt/strsclnt.c
@@ -320,11 +320,11 @@ printSecurityInfo(PRFileDesc *fd)
char * sp = CERT_NameToAscii(&cert->subject);
if (sp) {
fprintf(stderr, "strsclnt: subject DN: %s\n", sp);
- PR_Free(sp);
+ PORT_Free(sp);
}
if (ip) {
fprintf(stderr, "strsclnt: issuer DN: %s\n", ip);
- PR_Free(ip);
+ PORT_Free(ip);
}
}
if (cert) {
diff --git a/security/nss/cmd/tstclnt/tstclnt.c b/security/nss/cmd/tstclnt/tstclnt.c
index f4e257046..951d91fdb 100644
--- a/security/nss/cmd/tstclnt/tstclnt.c
+++ b/security/nss/cmd/tstclnt/tstclnt.c
@@ -189,11 +189,11 @@ void printSecurityInfo(PRFileDesc *fd)
char * sp = CERT_NameToAscii(&cert->subject);
if (sp) {
fprintf(stderr, "subject DN: %s\n", sp);
- PR_Free(sp);
+ PORT_Free(sp);
}
if (ip) {
fprintf(stderr, "issuer DN: %s\n", ip);
- PR_Free(ip);
+ PORT_Free(ip);
}
CERT_DestroyCertificate(cert);
cert = NULL;