Do not roll back to SSL 3.0 for Google properties.

net/http/http_network_transaction.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_network_transaction.h"
 
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 29 matching lines @@
 #include "net/http/http_proxy_client_socket_pool.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_request_info.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_response_info.h"
 #include "net/http/http_server_properties.h"
 #include "net/http/http_status_code.h"
 #include "net/http/http_stream_base.h"
 #include "net/http/http_stream_factory.h"
 #include "net/http/http_util.h"
+#include "net/http/transport_security_state.h"
 #include "net/http/url_security_manager.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/socks_client_socket_pool.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/socket/ssl_client_socket_pool.h"
 #include "net/socket/transport_client_socket_pool.h"
 #include "net/spdy/spdy_http_stream.h"
 #include "net/spdy/spdy_session.h"
 #include "net/spdy/spdy_session_pool.h"
 #include "net/ssl/ssl_cert_request_info.h"
@@ skipping 110 matching lines @@
 
   net_log_ = net_log;
   request_ = request_info;
   start_time_ = base::Time::Now();
 
   if (request_->load_flags & LOAD_DISABLE_CERT_REVOCATION_CHECKING) {
     server_ssl_config_.rev_checking_enabled = false;
     proxy_ssl_config_.rev_checking_enabled = false;
   }
 
+
+  if (!server_ssl_config_.ssl_version_min_preloaded_disabled) {
+    // If this is a Google domain, set the minimum SSL version to TLS 1.0.
+    // This prevents SSLv3 fallback.
+    bool sni_available =
+      server_ssl_config_.version_max >= SSL_PROTOCOL_VERSION_TLS1 ||
+      server_ssl_config_.version_fallback;

[agl, 2013/04/15 15:23:51]

I don't think version_fallback makes sense here. It's not like we can have
fallen back at this point.

|sni_available| is designed to remove HSTS requirements when SNI isn't sent
(i.e. SSLv3) and we didn't want to do that under the attackers control - i.e.
when falling back.

In this case, since we're setting TLSv1 to be the minimum version then SNI is
always sent. Thus I think this should always just be true.

[thaidn_google, 2013/04/16 00:38:16]

Done.

+    const std::string& host = request_->url.host();
+
+    if (TransportSecurityState::IsGooglePinnedProperty(host, sni_available)) {

[Ryan Sleevi, 2013/04/15 18:03:28]

nit: net/ style is to omit braces on one-line if statements.

[thaidn_google, 2013/04/16 00:38:16]

Done.

+      server_ssl_config_.version_min = SSL_PROTOCOL_VERSION_TLS1;
+    }
+  }
+
   next_state_ = STATE_CREATE_STREAM;
   int rv = DoLoop(OK);
   if (rv == ERR_IO_PENDING)
     callback_ = callback;
   return rv;
 }
 
 int HttpNetworkTransaction::RestartIgnoringLastError(
     const CompletionCallback& callback) {
   DCHECK(!stream_.get());
@@ skipping 1271 matching lines @@
       description = base::StringPrintf("Unknown state 0x%08X (%u)", state,
                                        state);
       break;
   }
   return description;
 }
 
 #undef STATE_CASE
 
 }  // namespace net