diff options
| author | hayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-11 03:12:08 +0000 |
|---|---|---|
| committer | hayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-11 03:12:08 +0000 |
| commit | 2028539fd25578e5725e528d8a2de8f53923576d (patch) | |
| tree | eb1ec876d2fcb69682da38588eb7d7468c9b937b /net/socket/client_socket_factory.cc | |
| parent | 772745f0895e84b6ba2dbc32ea26993e67d64b7e (diff) | |
| download | chromium_src-2028539fd25578e5725e528d8a2de8f53923576d.zip chromium_src-2028539fd25578e5725e528d8a2de8f53923576d.tar.gz chromium_src-2028539fd25578e5725e528d8a2de8f53923576d.tar.bz2 | |
Revert 49489 - Use NSS for SSL by default on Mac OS X.
To use Mac OS X Secure Transport in Chromium, specify the --use-system-ssl
command-line switch, which also replaced the --use-schannel command-line
switch for Windows. All other programs are hardcoded to use NSS for SSL.
If SSL client authentication is requested, fall back on Mac OS X Secure
Transport for now.
R=mark,mbelshe
BUG=30689
TEST=none
Review URL: http://codereview.chromium.org/2747002
TBR=wtc@chromium.org
Review URL: http://codereview.chromium.org/2775005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/client_socket_factory.cc')
| -rw-r--r-- | net/socket/client_socket_factory.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/socket/client_socket_factory.cc b/net/socket/client_socket_factory.cc index db819db..24d9e39 100644 --- a/net/socket/client_socket_factory.cc +++ b/net/socket/client_socket_factory.cc @@ -12,7 +12,6 @@ #include "net/socket/ssl_client_socket_nss.h" #elif defined(OS_MACOSX) #include "net/socket/ssl_client_socket_mac.h" -#include "net/socket/ssl_client_socket_nss.h" #endif #include "net/socket/tcp_client_socket.h" @@ -29,13 +28,7 @@ SSLClientSocket* DefaultSSLClientSocketFactory( #elif defined(USE_NSS) return new SSLClientSocketNSS(transport_socket, hostname, ssl_config); #elif defined(OS_MACOSX) - // TODO(wtc): SSLClientSocketNSS can't do SSL client authentication using - // Mac OS X CDSA/CSSM yet (http://crbug.com/45369), so fall back on - // SSLClientSocketMac. - if (ssl_config.client_cert) - return new SSLClientSocketMac(transport_socket, hostname, ssl_config); - - return new SSLClientSocketNSS(transport_socket, hostname, ssl_config); + return new SSLClientSocketMac(transport_socket, hostname, ssl_config); #else NOTIMPLEMENTED(); return NULL; |