diff options
| author | wtc%netscape.com <devnull@localhost> | 2002-07-16 23:26:09 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2002-07-16 23:26:09 +0000 |
| commit | 8783206457e9276dd255e39df01f989db60692a6 (patch) | |
| tree | b7f5d2a3d89bbaf514faed72bc0d61daaf20510e | |
| parent | 6c96929b0e4d7cc1d208392e9cf54f1610d9b3fe (diff) | |
| download | nss-hg-8783206457e9276dd255e39df01f989db60692a6.tar.gz | |
Merged the fix for bug 157750 on MOZILLA_1_0_BRANCH. a=chofmann forMOZILLA_1_0_2002082106_TAG
mozilla1.0.1 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; |