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 /net/third_party | |
| 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 'net/third_party')
| -rw-r--r-- | net/third_party/nss/ssl.gyp (renamed from net/third_party/nss/nss.gyp) | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/net/third_party/nss/nss.gyp b/net/third_party/nss/ssl.gyp index a3610f5..3166be8 100644 --- a/net/third_party/nss/nss.gyp +++ b/net/third_party/nss/ssl.gyp @@ -67,6 +67,10 @@ 'ssl/bodge/loader.h', 'ssl/bodge/secure_memcmp.c', ], + 'sources!': [ + 'ssl/os2_err.c', + 'ssl/os2_err.h', + ], 'defines': [ 'NSS_ENABLE_ECC', 'NSS_ENABLE_ZLIB', @@ -77,13 +81,20 @@ 'NO_NSPR_10_SUPPORT', ], 'conditions': [ + [ 'OS == "win"', { + 'sources!': [ + 'ssl/unix_err.c', + 'ssl/unix_err.h', + ], + }, + { # else: OS != "win" + 'sources!': [ + 'ssl/win32err.c', + 'ssl/win32err.h', + ], + }, + ], [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { - 'sources!': [ - 'ssl/os2_err.c', - 'ssl/os2_err.h', - 'ssl/win32err.c', - 'ssl/win32err.h', - ], 'defines': [ # These macros are needed only for compiling the files in # ssl/bodge. @@ -105,16 +116,10 @@ '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")', ], }], - [ 'OS == "win"', { + [ 'OS == "mac" or OS == "win"', { 'sources/': [ ['exclude', 'ssl/bodge/'], ], - 'sources!': [ - 'ssl/os2_err.c', - 'ssl/os2_err.h', - 'ssl/unix_err.c', - 'ssl/unix_err.h', - ], 'dependencies': [ '../../../third_party/zlib/zlib.gyp:zlib', '../../../third_party/nss/nss.gyp:nss', |