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

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

Issue 307813003: Always call talk_base::InitializeSSL() in chromoting plugin. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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 | no next file » | 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 d87953145de03eacfaff2dff99ee37942d5ba35c..5020be775d0ff92b6f00af5fc0fad96367f82291 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -246,9 +246,12 @@ 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));
-#elif defined(USE_NSS)
+#else
+ // Libjingle's SSL implementation is not really used, but it has to be
+ // initialized for NSS builds to make sure that RNG is initialized in NSS,
+ // because libjingle uses it.
talk_base::InitializeSSL();
-#endif // defined(USE_NSS)
+#endif // !defined(USE_OPENSSL)
// Send hello message.
scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698