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

Unified Diff: remoting/client/plugin/chromoting_instance.cc

Issue 297863005: Call net::EnsureNSSSSLInit() in the remoting client (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@git-svn
Patch Set: Created 6 years, 7 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
« no previous file with comments | « no previous file | remoting/protocol/libjingle_transport_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/plugin/chromoting_instance.cc
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index 100004de093ba6b2c1708eb09863b6b27f89487a..d87953145de03eacfaff2dff99ee37942d5ba35c 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());
« no previous file with comments | « no previous file | remoting/protocol/libjingle_transport_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698