Commit dac48051 authored by rsleevi@chromium.org's avatar rsleevi@chromium.org

Removed unreached code related to ESET MITM detection.

This is unnecessary as of r131649

BUG=none
TEST=net_unittests
R=agl


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137986 0039d316-1c4b-4281-b951-d872f2087c98
parent aa46fec2
...@@ -448,7 +448,6 @@ SSLClientSocketNSS::SSLClientSocketNSS(ClientSocketHandle* transport_socket, ...@@ -448,7 +448,6 @@ SSLClientSocketNSS::SSLClientSocketNSS(ClientSocketHandle* transport_socket,
handshake_callback_called_(false), handshake_callback_called_(false),
completed_handshake_(false), completed_handshake_(false),
ssl_session_cache_shard_(context.ssl_session_cache_shard), ssl_session_cache_shard_(context.ssl_session_cache_shard),
eset_mitm_detected_(false),
predicted_cert_chain_correct_(false), predicted_cert_chain_correct_(false),
next_handshake_state_(STATE_NONE), next_handshake_state_(STATE_NONE),
nss_fd_(NULL), nss_fd_(NULL),
...@@ -648,7 +647,6 @@ void SSLClientSocketNSS::Disconnect() { ...@@ -648,7 +647,6 @@ void SSLClientSocketNSS::Disconnect() {
server_cert_verify_result_ = NULL; server_cert_verify_result_ = NULL;
ssl_connection_status_ = 0; ssl_connection_status_ = 0;
completed_handshake_ = false; completed_handshake_ = false;
eset_mitm_detected_ = false;
start_cert_verification_time_ = base::TimeTicks(); start_cert_verification_time_ = base::TimeTicks();
predicted_cert_chain_correct_ = false; predicted_cert_chain_correct_ = false;
nss_bufs_ = NULL; nss_bufs_ = NULL;
...@@ -1445,9 +1443,6 @@ int SSLClientSocketNSS::DoHandshake() { ...@@ -1445,9 +1443,6 @@ int SSLClientSocketNSS::DoHandshake() {
} }
} else if (rv == SECSuccess) { } else if (rv == SECSuccess) {
if (handshake_callback_called_) { if (handshake_callback_called_) {
if (eset_mitm_detected_) {
net_error = ERR_ESET_ANTI_VIRUS_SSL_INTERCEPTION;
} else {
// We need to see if the predicted certificate chain (in // We need to see if the predicted certificate chain (in
// |ssl_host_info_->state().certs) matches the actual certificate chain // |ssl_host_info_->state().certs) matches the actual certificate chain
// before we call SaveSSLHostInfo, as that will update // before we call SaveSSLHostInfo, as that will update
...@@ -1512,7 +1507,6 @@ int SSLClientSocketNSS::DoHandshake() { ...@@ -1512,7 +1507,6 @@ int SSLClientSocketNSS::DoHandshake() {
SaveSSLHostInfo(); SaveSSLHostInfo();
// SSL handshake is completed. Let's verify the certificate. // SSL handshake is completed. Let's verify the certificate.
GotoState(STATE_VERIFY_DNSSEC); GotoState(STATE_VERIFY_DNSSEC);
}
// Done! // Done!
} else { } else {
// Workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=562434 - // Workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=562434 -
......
...@@ -273,10 +273,6 @@ class SSLClientSocketNSS : public SSLClientSocket { ...@@ -273,10 +273,6 @@ class SSLClientSocketNSS : public SSLClientSocket {
// resume on the socket with a different value. // resume on the socket with a different value.
const std::string ssl_session_cache_shard_; const std::string ssl_session_cache_shard_;
// True iff we believe that the user has an ESET product intercepting our
// HTTPS connections.
bool eset_mitm_detected_;
// True iff |ssl_host_info_| contained a predicted certificate chain and // True iff |ssl_host_info_| contained a predicted certificate chain and
// that we found the prediction to be correct. // that we found the prediction to be correct.
bool predicted_cert_chain_correct_; bool predicted_cert_chain_correct_;
......
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