Skip to content

GitLab

T
tangled
Commit 4fab8f90 authored by mmenke@chromium.org's avatar mmenke@chromium.org
Browse files
Options

Reland of http://codereview.chromium.org/10877025/. Accidentally included... 

Reland of http://codereview.chromium.org/10877025/.  Accidentally included other code in the CL when manually landing after the CQ got stuck, so had to revert (See http://codereview.chromium.org/10880048/)

Remove no longer used NetNanny and ESET anti-virus error
strings and ESET error code.

TBR=agl@chromium.org, thakis@chromium.org
BUG=none

Review URL: https://chromiumcodereview.appspot.com/10870103

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153564 0039d316-1c4b-4281-b951-d872f2087c98
parent 7da0c2b7
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 64 deletions
chrome/app/generated_resources.grd
View file @ 4fab8f90
...@@ -8166,9 +8166,6 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1 ...@@ -8166,9 +8166,6 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1
<message name="IDS_ERRORPAGES_HEADING_WEAK_SERVER_EPHEMERAL_DH_KEY" desc="Heading of the error page when the server has a weak Diffie-Hellman public key. Diffie-Hellman is a technical term and the conjuction of two names so may be best left untranslated. 'key' here is used as the technical name for a large number with certain mathematical properties that allow it to be used to encrypt and decrypt data. 'weak' here means that the number is too small to resist an exhaustive attempt to find certain mathematical structures in it, the secrecy of which is critical."> <message name="IDS_ERRORPAGES_HEADING_WEAK_SERVER_EPHEMERAL_DH_KEY" desc="Heading of the error page when the server has a weak Diffie-Hellman public key. Diffie-Hellman is a technical term and the conjuction of two names so may be best left untranslated. 'key' here is used as the technical name for a large number with certain mathematical properties that allow it to be used to encrypt and decrypt data. 'weak' here means that the number is too small to resist an exhaustive attempt to find certain mathematical structures in it, the secrecy of which is critical.">
Server has a weak ephemeral Diffie-Hellman public key Server has a weak ephemeral Diffie-Hellman public key
</message> </message>
<message name="IDS_ERRORPAGES_HEADING_ESET_ANTI_VIRUS_SSL_INTERCEPTION" desc="Heading of the error page when we detect that ESET anti-virus is running and intercepting our HTTPS connections. 'ESET' is a product name and may be best left untranslated.">
Cannot make secure connection because of ESET anti-virus
</message>
<message name="IDS_ERRORPAGES_HEADING_BLOCKED" desc="Heading of the error page when a request is blocked by an extension."> <message name="IDS_ERRORPAGES_HEADING_BLOCKED" desc="Heading of the error page when a request is blocked by an extension.">
This webpage was blocked by an extension This webpage was blocked by an extension
</message> </message>
...@@ -8386,51 +8383,6 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1 ...@@ -8386,51 +8383,6 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1
won't use insecure connections in order to protect your privacy. won't use insecure connections in order to protect your privacy.
</message> </message>
<if expr="pp_ifdef('android')">
<message name="IDS_ERRORPAGES_SUMMARY_ESET_ANTI_VIRUS_SSL_INTERCEPTION" desc="Mobile: Summary in the error page when we detect that ESET anti-virus is running and intercepting our HTTPS connections. 'ESET' is a product name and may be best left untranslated. 'Learn more' should be the contents of IDS_LEARN_MORE.">
<ph name="PRODUCT_NAME">&lt;span jscontent="productName"&gt;&lt;/span&gt;<ex>Google Chrome</ex></ph>
has detected that an ESET product is intercepting secure connections.
This is typically not a security issue as the ESET software is
usually running on the same mobile device. However, due to an intolerance
to specific aspects of
<ph name="PRODUCT_NAME">&lt;span jscontent="productName"&gt;&lt;/span&gt;<ex>Google Chrome</ex></ph>'s
secure connections, ESET products have to be configured to not
perform this interception. Click the 'Learn more' link for
instructions.
</message>
<message name="IDS_ERRORPAGES_SUMMARY_NETNANNY_SSL_INTERCEPTION" desc="Mobile: Summary in the error page when we detect that NetNanny is running and intercepting our HTTPS connections. 'NetNanny' is a product name and may be best left untranslated. 'Learn more' should be the contents of IDS_LEARN_MORE.">
<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> has detected that
NetNanny is intercepting secure connections. This is typically
not a security issue as the NetNanny software is usually running on the
same mobile device. However, due to an intolerance to specific aspects of
Chrome's secure connections, NetNanny has to be configured to not
perform this interception. Click the 'Learn more' link for instructions.
</message>
</if>
<if expr="not pp_ifdef('android')">
<message name="IDS_ERRORPAGES_SUMMARY_ESET_ANTI_VIRUS_SSL_INTERCEPTION" desc="Summary in the error page when we detect that ESET anti-virus is running and intercepting our HTTPS connections. 'ESET' is a product name and may be best left untranslated. 'Learn more' should be the contents of IDS_LEARN_MORE.">
<ph name="PRODUCT_NAME">&lt;span jscontent="productName"&gt;&lt;/span&gt;<ex>Google Chrome</ex></ph>
has detected that an ESET product is intercepting secure connections.
This is typically not a security issue as the ESET software is
usually running on the same computer. However, due to an intolerance
to specific aspects of
<ph name="PRODUCT_NAME">&lt;span jscontent="productName"&gt;&lt;/span&gt;<ex>Google Chrome</ex></ph>'s
secure connections, ESET products have to be configured to not
perform this interception. Click the 'Learn more' link for
instructions.
</message>
<message name="IDS_ERRORPAGES_SUMMARY_NETNANNY_SSL_INTERCEPTION" desc="Summary in the error page when we detect that NetNanny is running and intercepting our HTTPS connections. 'NetNanny' is a product name and may be best left untranslated. 'Learn more' should be the contents of IDS_LEARN_MORE.">
<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> has detected that
NetNanny is intercepting secure connections. This is typically
not a security issue as the NetNanny software is usually running on the
same computer. However, due to an intolerance to specific aspects of
Chrome's secure connections, NetNanny has to be configured to not
perform this interception. Click the 'Learn more' link for instructions.
</message>
</if>
<message name="IDS_ERRORPAGES_DETAILS_TEMPLATE" desc="On the bottom of the error page text, there is a box that includes extra information for tech savvy users."> <message name="IDS_ERRORPAGES_DETAILS_TEMPLATE" desc="On the bottom of the error page text, there is a box that includes extra information for tech savvy users.">
Error <ph name="ERROR_NUMBER">$1<ex>5</ex></ph> (<ph name="ERROR_NAME">$2<ex>net::ERR_FILE_NOT_FOUND</ex></ph>): <ph name="ERROR_TEXT">$3<ex>The requested file is not found.</ex></ph> Error <ph name="ERROR_NUMBER">$1<ex>5</ex></ph> (<ph name="ERROR_NAME">$2<ex>net::ERR_FILE_NOT_FOUND</ex></ph>): <ph name="ERROR_TEXT">$3<ex>The requested file is not found.</ex></ph>
</message> </message>
chrome/common/localized_error.cc
View file @ 4fab8f90
...@@ -35,8 +35,6 @@ static const char kRedirectLoopLearnMoreUrl[] = ...@@ -35,8 +35,6 @@ static const char kRedirectLoopLearnMoreUrl[] =
static const char kWeakDHKeyLearnMoreUrl[] = static const char kWeakDHKeyLearnMoreUrl[] =
"http://sites.google.com/a/chromium.org/dev/" "http://sites.google.com/a/chromium.org/dev/"
"err_ssl_weak_server_ephemeral_dh_key"; "err_ssl_weak_server_ephemeral_dh_key";
static const char kESETLearnMoreUrl[] =
"http://kb.eset.com/esetkb/index?page=content&id=SOLN2588";
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
static const char kAppWarningLearnMoreUrl[] = static const char kAppWarningLearnMoreUrl[] =
"chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html" "chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html"
...@@ -252,13 +250,6 @@ const LocalizedErrorMap net_error_options[] = { ...@@ -252,13 +250,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR, IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR,
SUGGEST_LEARNMORE, SUGGEST_LEARNMORE,
}, },
{net::ERR_ESET_ANTI_VIRUS_SSL_INTERCEPTION,
IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_ESET_ANTI_VIRUS_SSL_INTERCEPTION,
IDS_ERRORPAGES_SUMMARY_ESET_ANTI_VIRUS_SSL_INTERCEPTION,
IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR,
SUGGEST_LEARNMORE,
},
{net::ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN, {net::ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN,
IDS_ERRORPAGES_TITLE_LOAD_FAILED, IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_PINNING_FAILURE, IDS_ERRORPAGES_HEADING_PINNING_FAILURE,
...@@ -645,9 +636,6 @@ void LocalizedError::GetStrings(const WebKit::WebURLError& error, ...@@ -645,9 +636,6 @@ void LocalizedError::GetStrings(const WebKit::WebURLError& error,
case net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY: case net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY:
learn_more_url = GURL(kWeakDHKeyLearnMoreUrl); learn_more_url = GURL(kWeakDHKeyLearnMoreUrl);
break; break;
case net::ERR_ESET_ANTI_VIRUS_SSL_INTERCEPTION:
learn_more_url = GURL(kESETLearnMoreUrl);
break;
default: default:
break; break;
} }
......
net/base/net_error_list.h
View file @ 4fab8f90
...@@ -199,10 +199,7 @@ NET_ERROR(PROXY_CONNECTION_FAILED, -130) ...@@ -199,10 +199,7 @@ NET_ERROR(PROXY_CONNECTION_FAILED, -130)
// that a mandatory PAC script could not be fetched, parsed or executed. // that a mandatory PAC script could not be fetched, parsed or executed.
NET_ERROR(MANDATORY_PROXY_CONFIGURATION_FAILED, -131) NET_ERROR(MANDATORY_PROXY_CONFIGURATION_FAILED, -131)
// We detected an ESET product intercepting our HTTPS connections. Since these // -132 was formerly ERR_ESET_ANTI_VIRUS_SSL_INTERCEPTION
// products are False Start intolerant, we return this error so that we can
// give the user a helpful error message rather than have the connection hang.
NET_ERROR(ESET_ANTI_VIRUS_SSL_INTERCEPTION, -132)
// We've hit the max socket limit for the socket pool while preconnecting. We // We've hit the max socket limit for the socket pool while preconnecting. We
// don't bother trying to preconnect more sockets. // don't bother trying to preconnect more sockets.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment