Check trust bits before examining cert fields when classifying certs: bug 178692 r=ssauxh sr=brendan a=asa
git-svn-id: svn://10.0.0.236/trunk@154694 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
dcb6fabc6b
commit
9e81b2fcf2
@ -545,10 +545,14 @@ getCertType(CERTCertificate *cert)
|
||||
nsNSSCertTrust trust(cert->trust);
|
||||
if (cert->nickname && trust.HasAnyUser())
|
||||
return nsIX509Cert::USER_CERT;
|
||||
if (trust.HasAnyCA() || CERT_IsCACert(cert,NULL))
|
||||
if (trust.HasAnyCA())
|
||||
return nsIX509Cert::CA_CERT;
|
||||
if (trust.HasPeer(PR_TRUE, PR_FALSE, PR_FALSE))
|
||||
return nsIX509Cert::SERVER_CERT;
|
||||
if (trust.HasPeer(PR_FALSE, PR_TRUE, PR_FALSE) && cert->emailAddr)
|
||||
return nsIX509Cert::EMAIL_CERT;
|
||||
if (CERT_IsCACert(cert,NULL))
|
||||
return nsIX509Cert::CA_CERT;
|
||||
if (cert->emailAddr)
|
||||
return nsIX509Cert::EMAIL_CERT;
|
||||
return nsIX509Cert::SERVER_CERT;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user