summaryrefslogtreecommitdiffstats
path: root/chrome/third_party
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/third_party')
-rw-r--r--chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp b/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp
index 2f9a4e9..56565fc 100644
--- a/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp
+++ b/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp
@@ -1056,12 +1056,10 @@ net::CertType GetCertType(CERTCertificate *cert) {
nsNSSCertTrust trust(cert->trust);
if (cert->nickname && trust.HasAnyUser())
return net::USER_CERT;
- if (trust.HasAnyCA())
+ if (trust.HasAnyCA() || CERT_IsCACert(cert, NULL))
return net::CA_CERT;
if (trust.HasPeer(PR_TRUE, PR_FALSE, PR_FALSE))
return net::SERVER_CERT;
- if (CERT_IsCACert(cert, NULL))
- return net::CA_CERT;
return net::UNKNOWN_CERT;
}