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

Unified Diff: net/socket/ssl_client_socket_nss_factory.cc

Issue 795006: When using SSLClientSocketNSS on Windows, fall back on SSLClientSocketWin... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Log an error message if we can't open the MY system certificate store. Created 10 years, 9 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 | « net/socket/ssl_client_socket_nss.cc ('k') | net/socket/ssl_client_socket_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_nss_factory.cc
===================================================================
--- net/socket/ssl_client_socket_nss_factory.cc (revision 41189)
+++ net/socket/ssl_client_socket_nss_factory.cc (working copy)
@@ -4,7 +4,11 @@
#include "net/socket/client_socket_factory.h"
+#include "build/build_config.h"
#include "net/socket/ssl_client_socket_nss.h"
+#if defined(OS_WIN)
+#include "net/socket/ssl_client_socket_win.h"
+#endif
// This file is only used on platforms where NSS is not the system SSL
// library. When compiled, this file is the only object module that pulls
@@ -17,6 +21,14 @@
ClientSocket* transport_socket,
const std::string& hostname,
const SSLConfig& ssl_config) {
+ // TODO(wtc): SSLClientSocketNSS can't do SSL client authentication using
+ // CryptoAPI yet (http://crbug.com/37560), so we fall back on
+ // SSLClientSocketWin.
+#if defined(OS_WIN)
+ if (ssl_config.client_cert)
+ return new SSLClientSocketWin(transport_socket, hostname, ssl_config);
+#endif
+
return new SSLClientSocketNSS(transport_socket, hostname, ssl_config);
}
« no previous file with comments | « net/socket/ssl_client_socket_nss.cc ('k') | net/socket/ssl_client_socket_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698