Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Unified Diff: nss/mozilla/security/nss/lib/pk11wrap/pk11cert.c

Issue 3135002: Update to NSS 3.12.7 and NSPR 4.8.6.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: nss/mozilla/security/nss/lib/pk11wrap/pk11cert.c
===================================================================
--- nss/mozilla/security/nss/lib/pk11wrap/pk11cert.c (revision 55475)
+++ nss/mozilla/security/nss/lib/pk11wrap/pk11cert.c (working copy)
@@ -2477,11 +2477,10 @@
PK11SlotList *
PK11_GetAllSlotsForCert(CERTCertificate *cert, void *arg)
{
- NSSCertificate *c = STAN_GetNSSCertificate(cert);
- /* add multiple instances to the cert list */
nssCryptokiObject **ip;
- nssCryptokiObject **instances = nssPKIObject_GetInstances(&c->object);
PK11SlotList *slotList;
+ NSSCertificate *c;
+ nssCryptokiObject **instances;
PRBool found = PR_FALSE;
if (!cert) {
@@ -2489,6 +2488,14 @@
return NULL;
}
+ c = STAN_GetNSSCertificate(cert);
+ if (!c) {
+ CERT_MapStanError();
+ return NULL;
+ }
+
+ /* add multiple instances to the cert list */
+ instances = nssPKIObject_GetInstances(&c->object);
if (!instances) {
PORT_SetError(SEC_ERROR_NO_TOKEN);
return NULL;

Powered by Google App Engine
This is Rietveld 408576698