diff options
author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-06 10:50:48 +0000 |
---|---|---|
committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-06 10:50:48 +0000 |
commit | 0e8975cb53444523fd3f27cbf5344b0d292a9487 (patch) | |
tree | eb6dca98e5e9d7a6fae8dd17f00416bdc2f12bb5 /net | |
parent | b47ad7dbf1492d548cf5fc3c02120a2dd4721591 (diff) | |
download | chromium_src-0e8975cb53444523fd3f27cbf5344b0d292a9487.zip chromium_src-0e8975cb53444523fd3f27cbf5344b0d292a9487.tar.gz chromium_src-0e8975cb53444523fd3f27cbf5344b0d292a9487.tar.bz2 |
Remove CERT_STATUS_WEAK_DH_KEY. A weak DH key is not a certificate error.
R=agl@chromium.org,felt@chromium.org,rsleevi@chromium.org
BUG=348987
TEST=none
Review URL: https://codereview.chromium.org/187573009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255306 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r-- | net/cert/cert_status_flags.cc | 4 | ||||
-rw-r--r-- | net/cert/cert_status_flags.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/net/cert/cert_status_flags.cc b/net/cert/cert_status_flags.cc index 06ecddc..d278ea4 100644 --- a/net/cert/cert_status_flags.cc +++ b/net/cert/cert_status_flags.cc @@ -47,8 +47,6 @@ CertStatus MapNetErrorToCertStatus(int error) { return CERT_STATUS_WEAK_KEY; case ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN: return CERT_STATUS_PINNED_KEY_MISSING; - case ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY: - return CERT_STATUS_WEAK_DH_KEY; case ERR_CERT_NAME_CONSTRAINT_VIOLATION: return CERT_STATUS_NAME_CONSTRAINT_VIOLATION; default: @@ -67,8 +65,6 @@ int MapCertStatusToNetError(CertStatus cert_status) { return ERR_CERT_INVALID; if (cert_status & CERT_STATUS_PINNED_KEY_MISSING) return ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN; - if (cert_status & CERT_STATUS_WEAK_DH_KEY) - return ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY; // Recoverable errors if (cert_status & CERT_STATUS_AUTHORITY_INVALID) diff --git a/net/cert/cert_status_flags.h b/net/cert/cert_status_flags.h index 711474f..e217407 100644 --- a/net/cert/cert_status_flags.h +++ b/net/cert/cert_status_flags.h @@ -32,7 +32,7 @@ static const CertStatus CERT_STATUS_WEAK_SIGNATURE_ALGORITHM = 1 << 8; // 1 << 9 was used for CERT_STATUS_NOT_IN_DNS static const CertStatus CERT_STATUS_NON_UNIQUE_NAME = 1 << 10; static const CertStatus CERT_STATUS_WEAK_KEY = 1 << 11; -static const CertStatus CERT_STATUS_WEAK_DH_KEY = 1 << 12; +// 1 << 12 was used for CERT_STATUS_WEAK_DH_KEY. static const CertStatus CERT_STATUS_PINNED_KEY_MISSING = 1 << 13; static const CertStatus CERT_STATUS_NAME_CONSTRAINT_VIOLATION = 1 << 14; |