diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-03 02:03:54 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-03 02:03:54 +0000 |
| commit | d6bb669008e0308f3ee6e04e77fe903698864e7b (patch) | |
| tree | 7f2013216a4f4dc0d8f94ae8036e1bf647746cb5 /net/base | |
| parent | 9202f5e325445f1673fa48cdd124649d7e0a410d (diff) | |
| download | chromium_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 'net/base')
| -rw-r--r-- | net/base/cert_database_nss.cc | 1 | ||||
| -rw-r--r-- | net/base/cert_type.h | 10 |
2 files changed, 4 insertions, 7 deletions
diff --git a/net/base/cert_database_nss.cc b/net/base/cert_database_nss.cc index 937288a..a32a7a3 100644 --- a/net/base/cert_database_nss.cc +++ b/net/base/cert_database_nss.cc @@ -168,7 +168,6 @@ unsigned int CertDatabase::GetCertTrust( trust.HasTrustedCA(PR_FALSE, PR_TRUE, PR_FALSE) * TRUSTED_EMAIL + trust.HasTrustedCA(PR_FALSE, PR_FALSE, PR_TRUE) * TRUSTED_OBJ_SIGN; case SERVER_CERT: - case EMAIL_CERT: return trust.HasTrustedPeer(PR_TRUE, PR_FALSE, PR_FALSE) * TRUSTED_SSL + trust.HasTrustedPeer(PR_FALSE, PR_TRUE, PR_FALSE) * TRUSTED_EMAIL + trust.HasTrustedPeer(PR_FALSE, PR_FALSE, PR_TRUE) * TRUSTED_OBJ_SIGN; diff --git a/net/base/cert_type.h b/net/base/cert_type.h index fbe4339..d9cb8a5 100644 --- a/net/base/cert_type.h +++ b/net/base/cert_type.h @@ -11,16 +11,14 @@ namespace net { // This is only used in the context of CertDatabase, but is defined outside to // avoid an awkwardly long type name. // The type is a combination of intrinsic properties, such as the presense of an -// email address or Certificate Authority Basic Constraint, and assigned trust -// values. For example, a cert with no email address, basic constraints, or -// trust, would be classified as UNKNOWN_CERT. If that cert is then trusted -// with SetCertTrust(cert, SERVER_CERT, TRUSTED_SSL), it would become a -// SERVER_CERT. +// Certificate Authority Basic Constraint, and assigned trust values. For +// example, a cert with no basic constraints or trust would be classified as +// UNKNOWN_CERT. If that cert is then trusted with SetCertTrust(cert, +// SERVER_CERT, TRUSTED_SSL), it would become a SERVER_CERT. enum CertType { UNKNOWN_CERT, CA_CERT, USER_CERT, - EMAIL_CERT, SERVER_CERT, NUM_CERT_TYPES }; |