diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-26 04:29:05 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-26 04:29:05 +0000 |
| commit | 3553fe8cee59a0c7474aa7eb8c5fd1c6d5e5be99 (patch) | |
| tree | 4ca16496626fe90cc8cb68b0f226ac9d5b1b1c78 /remoting/client | |
| parent | 6587aa7f2fce7b8999660e3c316a9c184393cd70 (diff) | |
| download | chromium_src-3553fe8cee59a0c7474aa7eb8c5fd1c6d5e5be99.zip chromium_src-3553fe8cee59a0c7474aa7eb8c5fd1c6d5e5be99.tar.gz chromium_src-3553fe8cee59a0c7474aa7eb8c5fd1c6d5e5be99.tar.bz2 | |
Call talk_base::InitializeSSL() in the remoting client
Previously the client was calling EnsureSSLServerSockets(), which
internally calls EnsureNSSSSLInit(). It's not necessary to initialize
server socket so that call was removed in r263951, and NSS is no longer
initialized, which sometimes breaks the client (see the bug). Also
removed the workaround.
BUG=364689
Review URL: https://codereview.chromium.org/297863005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272789 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client')
| -rw-r--r-- | remoting/client/plugin/chromoting_instance.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc index 100004d..d879531 100644 --- a/remoting/client/plugin/chromoting_instance.cc +++ b/remoting/client/plugin/chromoting_instance.cc @@ -54,6 +54,7 @@ #include "remoting/protocol/host_stub.h" #include "remoting/protocol/libjingle_transport_factory.h" #include "third_party/libjingle/source/talk/base/helpers.h" +#include "third_party/libjingle/source/talk/base/ssladapter.h" #include "url/gurl.h" // Windows defines 'PostMessage', so we have to undef it. @@ -245,7 +246,9 @@ ChromotingInstance::ChromotingInstance(PP_Instance pp_instance) char random_seed[kRandomSeedSize]; crypto::RandBytes(random_seed, sizeof(random_seed)); talk_base::InitRandom(random_seed, sizeof(random_seed)); -#endif // defined(USE_OPENSSL) +#elif defined(USE_NSS) + talk_base::InitializeSSL(); +#endif // defined(USE_NSS) // Send hello message. scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue()); |