diff options
author | wtc%netscape.com <devnull@localhost> | 2002-07-16 23:23:19 +0000 |
---|---|---|
committer | wtc%netscape.com <devnull@localhost> | 2002-07-16 23:23:19 +0000 |
commit | 335e448ba55374547c195aeb74ba53b6f4453cf3 (patch) | |
tree | add7720765a76fab8863889aece147392e1f052d | |
parent | 8111397ae69abe504bdf5a4d1cad4677f679fae0 (diff) | |
download | nss-hg-335e448ba55374547c195aeb74ba53b6f4453cf3.tar.gz |
Merged the fix for bug 157750 on NSS_3_5_BRANCH. a=chofmann for mozilla
trunk checkin.
-rw-r--r-- | security/nss/lib/pk11wrap/pk11cert.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/nss/lib/pk11wrap/pk11cert.c b/security/nss/lib/pk11wrap/pk11cert.c index ae0629d49..26ff80a32 100644 --- a/security/nss/lib/pk11wrap/pk11cert.c +++ b/security/nss/lib/pk11wrap/pk11cert.c @@ -397,7 +397,7 @@ pk11_isID0(PK11SlotInfo *slot, CK_OBJECT_HANDLE certID) * Create an NSSCertificate from a slot/certID pair, return it as a * CERTCertificate. */ -CERTCertificate +static CERTCertificate *pk11_fastCert(PK11SlotInfo *slot, CK_OBJECT_HANDLE certID, CK_ATTRIBUTE *privateLabel, char **nickptr) { @@ -429,7 +429,7 @@ CERTCertificate } /* Build the old-fashioned nickname */ - if (nickptr) { + if ((nickptr) && (co->label)) { CK_ATTRIBUTE label, id; label.type = CKA_LABEL; label.pValue = co->label; |