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

Bug 403910: if the cert we found by nickname meets the requirements,

Browse Source 
CERT_FindUserCertByUsage should just return it.  The patch is contributed
by Angelo Rosenfelder <angelo.rosenfelder@siemens.com>.  r=wtc,relyea


git-svn-id: svn://10.0.0.236/trunk@244124 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
wtc%google.com
2008-01-27 06:04:54 +00:00
parent 8b8d85c94f
commit b53400eb05
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/security/nss/lib/certhigh/certhigh.c
View File

@@ -282,6 +282,26 @@ CERT_FindUserCertByUsage(CERTCertDBHandle *handle,
}
if ( cert != NULL ) {
unsigned int requiredKeyUsage;
unsigned int requiredCertType;
rv = CERT_KeyUsageAndTypeForCertUsage(usage, PR_FALSE,
&requiredKeyUsage, &requiredCertType);
if ( rv != SECSuccess ) {
/* drop the extra reference */
CERT_DestroyCertificate(cert);
cert = NULL;
goto loser;
}
/* If we already found the right cert, just return it */
if ( (!validOnly || CERT_CheckCertValidTimes(cert, time, PR_FALSE)
== secCertTimeValid) &&
(CERT_CheckKeyUsage(cert, requiredKeyUsage) == SECSuccess) &&
(cert->nsCertType & requiredCertType) &&
CERT_IsUserCert(cert) ) {
return(cert);
}
/* collect certs for this nickname, sorting them into the list */
certList = CERT_CreateSubjectCertList(certList, handle,
&cert->derSubject, time, validOnly);