diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 22:44:30 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 22:44:30 +0000 |
| commit | 526b3f20f632e243bc8145cb2f152d50841f9dc3 (patch) | |
| tree | dd5a8957e1f417389b7e8776f1373118db03554b /remoting | |
| parent | f64da26e69609ca3a4a9250847d9b1c731171c6d (diff) | |
| download | chromium_src-526b3f20f632e243bc8145cb2f152d50841f9dc3.zip chromium_src-526b3f20f632e243bc8145cb2f152d50841f9dc3.tar.gz chromium_src-526b3f20f632e243bc8145cb2f152d50841f9dc3.tar.bz2 | |
Add an SSLConfig option to explicit disable NSSHttpIO.
This appears to be the least-bad solution to the problem that remoting can't
run SSL sockets on an IO MessageLoop. See linked bug for details.
BUG=118247
TEST=remoting_unittests
Review URL: http://codereview.chromium.org/9702075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127015 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/protocol/authenticator_test_base.h | 2 | ||||
| -rw-r--r-- | remoting/protocol/ssl_hmac_channel_authenticator.cc | 3 | ||||
| -rw-r--r-- | remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/remoting/protocol/authenticator_test_base.h b/remoting/protocol/authenticator_test_base.h index 6233423..cf2a73e 100644 --- a/remoting/protocol/authenticator_test_base.h +++ b/remoting/protocol/authenticator_test_base.h @@ -49,7 +49,7 @@ class AuthenticatorTestBase : public testing::Test { void OnClientConnected(net::Error error, scoped_ptr<net::StreamSocket> socket); - MessageLoopForIO message_loop_; + MessageLoop message_loop_; scoped_ptr<crypto::RSAPrivateKey> private_key_; std::string host_cert_; diff --git a/remoting/protocol/ssl_hmac_channel_authenticator.cc b/remoting/protocol/ssl_hmac_channel_authenticator.cc index 0fba849..99df767 100644 --- a/remoting/protocol/ssl_hmac_channel_authenticator.cc +++ b/remoting/protocol/ssl_hmac_channel_authenticator.cc @@ -97,8 +97,9 @@ void SslHmacChannelAuthenticator::SecureAndAuthenticate( // because we use self-signed certs. Disable it so that the SSL // layer doesn't try to initialize OCSP (OCSP works only on the IO // thread). - ssl_config.allowed_bad_certs.push_back(cert_and_status); + ssl_config.cert_io_enabled = false; ssl_config.rev_checking_enabled = false; + ssl_config.allowed_bad_certs.push_back(cert_and_status); net::HostPortPair host_and_port(kSslFakeHostName, 0); net::SSLClientSocketContext context; diff --git a/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc b/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc index 7084163..5af5299 100644 --- a/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc +++ b/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc @@ -104,7 +104,7 @@ class SslHmacChannelAuthenticatorTest : public testing::Test { client_socket_ = socket.Pass(); } - MessageLoopForIO message_loop_; + MessageLoop message_loop_; scoped_ptr<crypto::RSAPrivateKey> private_key_; std::string host_cert_; |