diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-28 19:44:02 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-28 19:44:02 +0000 |
| commit | f505a9b267f83d8375eee2037e5e08dc6197143d (patch) | |
| tree | f14dda4257275e562cdaa81c27cffe59f6ce53ea /net/net.gyp | |
| parent | 2618629d2408b7d152b5b0e189586740dd5332a6 (diff) | |
| download | chromium_src-f505a9b267f83d8375eee2037e5e08dc6197143d.zip chromium_src-f505a9b267f83d8375eee2037e5e08dc6197143d.tar.gz chromium_src-f505a9b267f83d8375eee2037e5e08dc6197143d.tar.bz2 | |
Port SSLClientSocketNSS to Windows. The next step is to
actually use it (controlled by a boolean flag in SSLConfig,
which is controlled by a command-line switch).
On Windows we still use CryptoAPI to verify and display
certificates. SSL client authentication isn't supported yet.
R=agl,mark
BUG=28744
TEST=No build errors.
Review URL: http://codereview.chromium.org/557027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37427 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rwxr-xr-x | net/net.gyp | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/net/net.gyp b/net/net.gyp index f16ebab..ef886f7 100755 --- a/net/net.gyp +++ b/net/net.gyp @@ -173,6 +173,8 @@ [ 'OS == "win"', { 'sources/': [ ['exclude', '_(mac|linux|posix)\\.cc$'] ], 'dependencies': [ + # For nss_memio.{c,h}, which require only NSPR. + '../third_party/nss/nss.gyp:nspr', 'tld_cleanup', ], }, @@ -189,8 +191,6 @@ 'sources!': [ 'base/cert_database_nss.cc', 'base/keygen_handler_nss.cc', - 'base/nss_memio.c', - 'base/nss_memio.h', 'base/x509_certificate_nss.cc', ], # Get U_STATIC_IMPLEMENTATION and -I directories on Linux. @@ -202,6 +202,12 @@ ], [ 'OS == "mac"', { 'sources/': [ ['exclude', '_(linux|win)\\.cc$'] ], + 'sources!': [ + # TODO(wtc): Remove nss_memio.{c,h} when http://crbug.com/30689 + # is fixed. + 'base/nss_memio.c', + 'base/nss_memio.h', + ], 'link_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/Security.framework', @@ -522,6 +528,8 @@ 'socket/tcp_client_socket_libevent.cc', ], 'dependencies': [ + '../third_party/nss/nss.gyp:nss', + 'third_party/nss/nss.gyp:ssl', 'tld_cleanup', ], }, @@ -538,8 +546,6 @@ 'sources!': [ 'ocsp/nss_ocsp.cc', 'ocsp/nss_ocsp.h', - 'socket/ssl_client_socket_nss.cc', - 'socket/ssl_client_socket_nss.h', ], # Get U_STATIC_IMPLEMENTATION and -I directories on Linux. 'dependencies': [ @@ -550,6 +556,12 @@ ], [ 'OS == "mac"', { 'sources/': [ ['exclude', '_(linux|win)\\.cc$'] ], + 'sources!': [ + # TODO(wtc): Remove ssl_client_socket_nss.{cc,h} when + # http://crbug.com/30689 is fixed. + 'socket/ssl_client_socket_nss.cc', + 'socket/ssl_client_socket_nss.h', + ], 'link_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/Security.framework', |