summaryrefslogtreecommitdiffstats
path: root/chrome/third_party
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-03 02:03:54 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-03 02:03:54 +0000
commitd6bb669008e0308f3ee6e04e77fe903698864e7b (patch)
tree7f2013216a4f4dc0d8f94ae8036e1bf647746cb5 /chrome/third_party
parent9202f5e325445f1673fa48cdd124649d7e0a410d (diff)
downloadchromium_src-d6bb669008e0308f3ee6e04e77fe903698864e7b.zip
chromium_src-d6bb669008e0308f3ee6e04e77fe903698864e7b.tar.gz
chromium_src-d6bb669008e0308f3ee6e04e77fe903698864e7b.tar.bz2
DOMUI Cert Manager: merge email certs into other certs tab.
BUG=19991 TEST=cert manager no longer has a "people" tab, any certs that were there are now in "other" tab. Review URL: http://codereview.chromium.org/4310004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64866 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/third_party')
-rw-r--r--chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp b/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp
index 6e8b54d..cf0d7f7 100644
--- a/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp
+++ b/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp
@@ -1039,12 +1039,8 @@ net::CertType GetCertType(CERTCertificate *cert) {
return net::CA_CERT;
if (trust.HasPeer(PR_TRUE, PR_FALSE, PR_FALSE))
return net::SERVER_CERT;
- if (trust.HasPeer(PR_FALSE, PR_TRUE, PR_FALSE) && cert->emailAddr)
- return net::EMAIL_CERT;
if (CERT_IsCACert(cert, NULL))
return net::CA_CERT;
- if (cert->emailAddr)
- return net::EMAIL_CERT;
return net::UNKNOWN_CERT;
}