diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-29 21:06:35 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-29 21:06:35 +0000 |
| commit | 8c169d20455b37a5bf8761e8d13cb157c390e126 (patch) | |
| tree | 952367d489557794c1bb8991dcec99e161b52ca1 /remoting/protocol | |
| parent | fea09ae436946fb072c684e016d664b42ae34cab (diff) | |
| download | chromium_src-8c169d20455b37a5bf8761e8d13cb157c390e126.zip chromium_src-8c169d20455b37a5bf8761e8d13cb157c390e126.tar.gz chromium_src-8c169d20455b37a5bf8761e8d13cb157c390e126.tar.bz2 | |
Re-enable use of TLS False Start on stream channels.
Requires r94105 to work.
BUG=
TEST=remoting_unittests
Review URL: http://codereview.chromium.org/7493071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94751 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
| -rw-r--r-- | remoting/protocol/jingle_stream_connector.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/remoting/protocol/jingle_stream_connector.cc b/remoting/protocol/jingle_stream_connector.cc index cc671e2..86add44 100644 --- a/remoting/protocol/jingle_stream_connector.cc +++ b/remoting/protocol/jingle_stream_connector.cc @@ -37,9 +37,6 @@ net::SSLClientSocket* CreateSSLClientSocket( net::StreamSocket* socket, const std::string& der_cert, net::CertVerifier* cert_verifier) { net::SSLConfig ssl_config; - // If False Start is enabled then the Connect callback will fire before - // the cipher has been set up, and ExportKeyingMaterial will fail. - ssl_config.false_start_enabled = false; // Certificate provided by the host doesn't need authority. net::SSLConfig::CertAndStatus cert_and_status; @@ -147,8 +144,6 @@ bool JingleStreamConnector::EstablishSSLConnection() { // Create server SSL socket. net::SSLConfig ssl_config; - ssl_config.false_start_enabled = false; - ssl_server_socket_ = net::CreateSSLServerSocket( socket_.release(), cert, local_private_key_, ssl_config); socket_.reset(ssl_server_socket_); |