Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(715)

Unified Diff: net/http/http_stream_request.cc

Issue 6017010: Ensure that when using False Start + client auth, bad client certificates are not cached (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix mac compile Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/http/http_stream_request.cc
diff --git a/net/http/http_stream_request.cc b/net/http/http_stream_request.cc
index c03114590d22874e69b44890d6cf075d56f5618c..ea0b588ec4388b2fe5244bfe289a3e5f2c5bd8ad 100644
--- a/net/http/http_stream_request.cc
+++ b/net/http/http_stream_request.cc
@@ -761,7 +761,7 @@ int HttpStreamRequest::DoInitConnectionComplete(int result) {
}
}
if (result < 0)
- return HandleSSLHandshakeError(result);
+ return result;
}
next_state_ = STATE_CREATE_STREAM;
@@ -1043,35 +1043,6 @@ int HttpStreamRequest::HandleCertificateError(int error) {
return error;
}
-int HttpStreamRequest::HandleSSLHandshakeError(int error) {
- if (ssl_config()->send_client_cert &&
- (error == ERR_SSL_PROTOCOL_ERROR ||
- error == ERR_BAD_SSL_CLIENT_AUTH_CERT)) {
- session_->ssl_client_auth_cache()->Remove(
- GetHostAndPort(request_info().url));
- }
-
- switch (error) {
- case ERR_SSL_PROTOCOL_ERROR:
- case ERR_SSL_VERSION_OR_CIPHER_MISMATCH:
- case ERR_SSL_DECOMPRESSION_FAILURE_ALERT:
- case ERR_SSL_BAD_RECORD_MAC_ALERT:
- if (ssl_config()->tls1_enabled &&
- !SSLConfigService::IsKnownStrictTLSServer(
- request_info().url.host())) {
- // This could be a TLS-intolerant server, an SSL 3.0 server that
- // chose a TLS-only cipher suite or a server with buggy DEFLATE
- // support. Turn off TLS 1.0, DEFLATE support and retry.
- factory_->AddTLSIntolerantServer(request_info().url);
- next_state_ = STATE_INIT_CONNECTION;
- DCHECK(!connection_.get() || !connection_->socket());
- error = OK;
- }
- break;
- }
- return error;
-}
-
void HttpStreamRequest::SwitchToSpdyMode() {
if (HttpStreamFactory::spdy_enabled())
using_spdy_ = true;

Powered by Google App Engine
This is Rietveld 408576698