diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-10 16:24:58 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-10 16:24:58 +0000 |
| commit | 3e4913140ea1e345aec3fd6a8abe581f4c1e0b5d (patch) | |
| tree | 750c8286842050f635ed8d5f8a9a6aa510988958 | |
| parent | 27418811be763acd36997bab576e68e1fa59cb83 (diff) | |
| download | chromium_src-3e4913140ea1e345aec3fd6a8abe581f4c1e0b5d.zip chromium_src-3e4913140ea1e345aec3fd6a8abe581f4c1e0b5d.tar.gz chromium_src-3e4913140ea1e345aec3fd6a8abe581f4c1e0b5d.tar.bz2 | |
Merge 254990 "net: a weak DH key is not a certificate error."
> net: a weak DH key is not a certificate error.
>
> BUG=348987
>
> Review URL: https://codereview.chromium.org/178003011
TBR=agl@chromium.org
Review URL: https://codereview.chromium.org/192583003
git-svn-id: svn://svn.chromium.org/chrome/branches/1847/src@255953 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/base/net_errors.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/base/net_errors.h b/net/base/net_errors.h index c8742a8..2c51361 100644 --- a/net/base/net_errors.h +++ b/net/base/net_errors.h @@ -36,8 +36,9 @@ NET_EXPORT const char* ErrorToString(int error); inline bool IsCertificateError(int error) { // Certificate errors are negative integers from net::ERR_CERT_BEGIN // (inclusive) to net::ERR_CERT_END (exclusive) in *decreasing* order. + // ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN is currently an exception to this + // rule. return (error <= ERR_CERT_BEGIN && error > ERR_CERT_END) || - (error == ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY) || (error == ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN); } |