diff options
-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; |