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

Unified Diff: remoting/host/simple_host_process.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/host/remoting_me2me_host.cc ('k') | remoting/remoting.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/simple_host_process.cc
diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc
index 58e3c5d294548b21c8c27fbbe6ed13d318a6d200..cc12181536aea8272aaa81f7f8f8def14e9f8e98 100644
--- a/remoting/host/simple_host_process.cc
+++ b/remoting/host/simple_host_process.cc
@@ -31,6 +31,7 @@
#include "base/threading/thread.h"
#include "crypto/nss_util.h"
#include "net/base/network_change_notifier.h"
+#include "net/socket/ssl_server_socket.h"
#include "remoting/base/constants.h"
#include "remoting/host/capturer_fake.h"
#include "remoting/host/chromoting_host.h"
@@ -349,6 +350,10 @@ int main(int argc, char** argv) {
gfx::GtkInitFromCommandLine(*cmd_line);
#endif // TOOLKIT_GTK
+ // Enable support for SSL server sockets, which must be done while still
+ // single-threaded.
+ net::EnableSSLServerSockets();
+
remoting::SimpleHost simple_host;
if (cmd_line->HasSwitch(kConfigSwitchName)) {
« no previous file with comments | « remoting/host/remoting_me2me_host.cc ('k') | remoting/remoting.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698