From fd4f139fe08bc9596a7295fb5fee8300fb34856a Mon Sep 17 00:00:00 2001 From: "wtc@chromium.org" Date: Fri, 11 Jun 2010 17:02:20 +0000 Subject: Second attempt to land r49489. 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. Original review URL: http://codereview.chromium.org/2747002/show R=mark,mbelshe BUG=30689 TEST=none Review URL: http://codereview.chromium.org/2769012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49540 0039d316-1c4b-4281-b951-d872f2087c98 --- net/net.gyp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'net/net.gyp') diff --git a/net/net.gyp b/net/net.gyp index eb6686a..3dc5b4a 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -446,10 +446,12 @@ 'socket/ssl_client_socket.h', 'socket/ssl_client_socket_mac.cc', 'socket/ssl_client_socket_mac.h', - 'socket/ssl_client_socket_nss_factory.cc', - 'socket/ssl_client_socket_nss_factory.h', + 'socket/ssl_client_socket_mac_factory.cc', + 'socket/ssl_client_socket_mac_factory.h', 'socket/ssl_client_socket_nss.cc', 'socket/ssl_client_socket_nss.h', + 'socket/ssl_client_socket_nss_factory.cc', + 'socket/ssl_client_socket_nss_factory.h', 'socket/ssl_client_socket_win.cc', 'socket/ssl_client_socket_win.h', 'socket/tcp_client_socket.h', @@ -552,10 +554,6 @@ ], }], [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { - 'sources!': [ - 'socket/ssl_client_socket_nss_factory.cc', - 'socket/ssl_client_socket_nss_factory.h', - ], 'dependencies': [ '../build/linux/system.gyp:gconf', '../build/linux/system.gyp:gdk', @@ -588,6 +586,8 @@ { # else: OS != "win" 'sources!': [ 'proxy/proxy_resolver_winhttp.cc', + 'socket/ssl_client_socket_nss_factory.cc', + 'socket/ssl_client_socket_nss_factory.h', ], }, ], @@ -603,6 +603,12 @@ ] }, }, + { # else: OS != "mac" + 'sources!': [ + 'socket/ssl_client_socket_mac_factory.cc', + 'socket/ssl_client_socket_mac_factory.h', + ], + }, ], ], }, -- cgit v1.1