diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-01 20:28:03 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-01 20:28:03 +0000 |
| commit | 3dd6f5e0807447194b12c7adc9a730d81738a0a6 (patch) | |
| tree | 6176f288326fdb65d167ce419929260209fff32b /base | |
| parent | 3f94a9eedbb0bd352beeea9ae65591c69c9012f1 (diff) | |
| download | chromium_src-3dd6f5e0807447194b12c7adc9a730d81738a0a6.zip chromium_src-3dd6f5e0807447194b12c7adc9a730d81738a0a6.tar.gz chromium_src-3dd6f5e0807447194b12c7adc9a730d81738a0a6.tar.bz2 | |
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
Diffstat (limited to 'base')
| -rw-r--r-- | base/base.gypi | 14 | ||||
| -rw-r--r-- | base/nss_util.cc | 2 |
2 files changed, 5 insertions, 11 deletions
diff --git a/base/base.gypi b/base/base.gypi index ad41e45..fd9ea54 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -332,14 +332,7 @@ 'sources/': [ ['exclude', '_openbsd\\.cc$'] ], }, ], - [ 'OS == "mac"', { - 'sources!': [ - # TODO(wtc): Remove nss_util.{cc,h} when http://crbug.com/30689 - # is fixed. - 'nss_util.cc', - 'nss_util.h', - ], - }, { # OS != "mac" + [ 'OS != "mac"', { 'sources!': [ 'crypto/cssm_init.cc', 'crypto/cssm_init.h', @@ -453,11 +446,12 @@ ], }, },], - [ 'OS == "win"', { + [ 'OS == "mac" or OS == "win"', { 'dependencies': [ '../third_party/nss/nss.gyp:nss', ], - }, { # OS != "win" + },], + [ 'OS != "win"', { 'dependencies': ['../third_party/libevent/libevent.gyp:libevent'], 'sources!': [ 'third_party/purify/pure_api.c', 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 |