Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 129778, cert instances incorrectly reset when cert was not deleted

Browse Source 
checked in for wtc, r=mcgreer


git-svn-id: svn://10.0.0.236/trunk@116561 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ian.mcgreer%sun.com
2002-03-14 17:39:12 +00:00
parent c09a277407
commit f8d0860eef
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/security/nss/lib/pki/trustdomain.c
View File

@@ -32,7 +32,7 @@
*/
#ifdef DEBUG
static const char CVS_ID[] = "@(#) $RCSfile: trustdomain.c,v $ $Revision: 1.36 $ $Date: 2002-02-28 22:55:30 $ $Name: not supported by cvs2svn $";
static const char CVS_ID[] = "@(#) $RCSfile: trustdomain.c,v $ $Revision: 1.37 $ $Date: 2002-03-14 17:39:12 $ $Name: not supported by cvs2svn $";
#endif /* DEBUG */
#ifndef NSSPKI_H
@@ -508,7 +508,8 @@ static PRBool cert_token_not_present(NSSCertificate *c)
{
nssListIterator *instances;
nssCryptokiInstance *instance;
PRBool freeIt = PR_TRUE;
PRBool freeIt = PR_FALSE;
PRBool notPresent = PR_TRUE;
instances = nssList_CreateIterator(c->object.instanceList);
for (instance = (nssCryptokiInstance *)nssListIterator_Start(instances);
instance != (nssCryptokiInstance *)NULL;
@@ -517,17 +518,18 @@ static PRBool cert_token_not_present(NSSCertificate *c)
if (!nssToken_IsPresent(instance->token)) {
nssToken_DestroyCertList(instance->token, PR_TRUE);
nssList_Remove(c->object.instanceList, instance);
freeIt = PR_TRUE;
} else {
freeIt = PR_FALSE;
notPresent = PR_FALSE;
}
}
nssListIterator_Finish(instances);
nssListIterator_Destroy(instances);
if (!freeIt) {
if (freeIt) {
nssListIterator_Destroy(c->object.instances);
c->object.instances = nssList_CreateIterator(c->object.instanceList);
}
return freeIt;
return notPresent;
}
NSS_IMPLEMENT NSSCertificate *