From 3dd6f5e0807447194b12c7adc9a730d81738a0a6 Mon Sep 17 00:00:00 2001 From: "wtc@chromium.org" Date: Tue, 1 Jun 2010 20:28:03 +0000 Subject: Use SSLClientSocketNSS on Mac OS X. By default, chrome still uses SSLClientSocketMac. Specify the --use-nss-for-ssl command-line option to use SSLClientSocketNSS. The nss.gyp in src/net/third_party/nss is renamed ssl.gyp to avoid a naming conflict with the nss.gyp in src/third_party/nss. The GYP generator for Xcode project files disallows same-named .gyp files. SSL client authentication doesn't work yet. R=mark BUG=30689 TEST=No build and test failures on Mac and Windows. Review URL: http://codereview.chromium.org/2322008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48650 0039d316-1c4b-4281-b951-d872f2087c98 --- base/nss_util.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'base/nss_util.cc') diff --git a/base/nss_util.cc b/base/nss_util.cc index 4e67faf..7043b8d 100644 --- a/base/nss_util.cc +++ b/base/nss_util.cc @@ -21,7 +21,7 @@ // On some platforms, we use NSS for SSL only -- we don't use NSS for crypto // or certificate verification, and we don't use the NSS certificate and key // databases. -#if defined(OS_WIN) +#if defined(OS_MACOSX) || defined(OS_WIN) #define USE_NSS_FOR_SSL_ONLY 1 #endif -- cgit v1.1