diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-11 20:12:54 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-11 20:12:54 +0000 |
| commit | 710c31705b2619b5ba4b4c06e0a1257b3bf71a11 (patch) | |
| tree | cb68193c00b54a902ff65d91fcb8903ecafc67eb /net | |
| parent | 515040e36459a2f6b954e368f76abded22e8cef1 (diff) | |
| download | chromium_src-710c31705b2619b5ba4b4c06e0a1257b3bf71a11.zip chromium_src-710c31705b2619b5ba4b4c06e0a1257b3bf71a11.tar.gz chromium_src-710c31705b2619b5ba4b4c06e0a1257b3bf71a11.tar.bz2 | |
Fix 58162: Mixed Content False Positive for intranet hostname certificates
Previously, we lumped the intranet host warning in with mixed content warning. This calls it out as a separate warning.
BUG=58162
TEST=None
Review URL: http://codereview.chromium.org/3536019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62178 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/cert_status_flags.h | 1 | ||||
| -rw-r--r-- | net/base/net_error_list.h | 13 |
2 files changed, 9 insertions, 5 deletions
diff --git a/net/base/cert_status_flags.h b/net/base/cert_status_flags.h index 8bf2565..5303af1 100644 --- a/net/base/cert_status_flags.h +++ b/net/base/cert_status_flags.h @@ -22,6 +22,7 @@ enum { CERT_STATUS_INVALID = 1 << 7, CERT_STATUS_WEAK_SIGNATURE_ALGORITHM = 1 << 8, CERT_STATUS_NOT_IN_DNS = 1 << 9, + CERT_STATUS_NON_UNIQUE_NAME = 1 << 10, // Bits 16 to 30 are for non-error statuses. CERT_STATUS_IS_EV = 1 << 16, diff --git a/net/base/net_error_list.h b/net/base/net_error_list.h index b96524d..6e4c7b9 100644 --- a/net/base/net_error_list.h +++ b/net/base/net_error_list.h @@ -25,7 +25,7 @@ // finally completed. NET_ERROR(IO_PENDING, -1) -// A generic failure occured. +// A generic failure occurred. NET_ERROR(FAILED, -2) // An operation was aborted (due to user action). @@ -157,7 +157,7 @@ NET_ERROR(SSL_NO_RENEGOTIATION, -123) NET_ERROR(WINSOCK_UNEXPECTED_WRITTEN_BYTES, -124) // An SSL peer sent us a fatal decompression_failure alert. This typically -// occurs when a peer selects DEFLATE compression in the mismaken belief that +// occurs when a peer selects DEFLATE compression in the mistaken belief that // it supports it. NET_ERROR(SSL_DECOMPRESSION_FAILURE_ALERT, -125) @@ -278,13 +278,16 @@ NET_ERROR(CERT_WEAK_SIGNATURE_ALGORITHM, -208) // valid fingerprints. But the certificate presented was not in this list. NET_ERROR(CERT_NOT_IN_DNS, -209) +// The host name specified in the certificate is not unique. +NET_ERROR(CERT_NON_UNIQUE_NAME, -210) + // Add new certificate error codes here. // // Update the value of CERT_END whenever you add a new certificate error // code. // The value immediately past the last certificate error code. -NET_ERROR(CERT_END, -210) +NET_ERROR(CERT_END, -211) // The URL is invalid. NET_ERROR(INVALID_URL, -300) @@ -365,7 +368,7 @@ NET_ERROR(NO_SUPPORTED_PROXIES, -336) // There is a SPDY protocol framing error. NET_ERROR(SPDY_PROTOCOL_ERROR, -337) -// Credentials could not be estalished during HTTP Authentication. +// Credentials could not be established during HTTP Authentication. NET_ERROR(INVALID_AUTH_CREDENTIALS, -338) // An HTTP Authentication scheme was tried which is not supported on this @@ -471,7 +474,7 @@ NET_ERROR(IMPORT_CA_CERT_NOT_CA, -703) // Import failed - certificate already exists in database. // Note it's a little weird this is an error but reimporting a PKCS12 is ok -// (no-op). That's how mozilla does it, though. +// (no-op). That's how Mozilla does it, though. NET_ERROR(IMPORT_CERT_ALREADY_EXISTS, -704) // CA import failed due to some other error. |