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

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

Issue 10543106: Add an explicit function to init NSS for SSL server sockets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to r141775 and remove suppression Created 8 years, 6 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 | « remoting/DEPS ('k') | remoting/host/DEPS » ('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 a3ef5409a66b2b5827aeef162bd00f377da4a4ba..fb3da914ed1688d3e9f6883964ddec6e59642d8d 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -21,6 +21,7 @@
#include "base/values.h"
#include "jingle/glue/thread_wrapper.h"
#include "media/base/media.h"
+#include "net/socket/ssl_server_socket.h"
#include "ppapi/cpp/completion_callback.h"
#include "ppapi/cpp/input_event.h"
#include "ppapi/cpp/mouse_cursor.h"
@@ -187,6 +188,13 @@ bool ChromotingInstance::Init(uint32_t argc,
return false;
}
+ // Enable support for SSL server sockets, which must be done as early as
+ // possible, preferably before any NSS SSL sockets (client or server) have
+ // been created.
+ // It's possible that the hosting process has already made use of SSL, in
+ // which case, there may be a slight race.
+ net::EnableSSLServerSockets();
+
// Start all the threads.
context_.Start();
« no previous file with comments | « remoting/DEPS ('k') | remoting/host/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698