diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-29 12:27:44 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-29 12:27:44 +0000 |
| commit | d518cd9680f698fb14cb0d355c8f79f54e7c05e3 (patch) | |
| tree | c4afa3d0472c379055ad92de47bba8e1d4d6b874 /net/net.gyp | |
| parent | 2fb7dc983456e980d631501f4a120eb091d197e7 (diff) | |
| download | chromium_src-d518cd9680f698fb14cb0d355c8f79f54e7c05e3.zip chromium_src-d518cd9680f698fb14cb0d355c8f79f54e7c05e3.tar.gz chromium_src-d518cd9680f698fb14cb0d355c8f79f54e7c05e3.tar.bz2 | |
First step at OpenSSL client socket implementation.
This is early in-progress implementation, no cert handling supported. So only available under a build-time flag. (GYP_DEFINES="'use_openssl=1'")
Adds a new build dependency for system OpenSSL libraries, and a new USE_OPENSSL define. Eventually this will disable USE_NSS but for now the two coexist.
BUG=none
TEST=build with use_openssl=1. Goto some https:// pages.
Review URL: http://codereview.chromium.org/3495005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp index 06105fa..2128154 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -539,6 +539,8 @@ 'socket/ssl_client_socket_nss.h', 'socket/ssl_client_socket_nss_factory.cc', 'socket/ssl_client_socket_nss_factory.h', + 'socket/ssl_client_socket_openssl.cc', + 'socket/ssl_client_socket_openssl.h', 'socket/ssl_client_socket_pool.cc', 'socket/ssl_client_socket_pool.h', 'socket/ssl_client_socket_win.cc', @@ -650,6 +652,18 @@ 'proxy/proxy_config_service_linux.h', ], }], + ['use_openssl==1 and OS == "linux"', { + 'dependencies': [ + '../build/linux/system.gyp:openssl', + ] + }, + { # else !use_openssl: remove the unneeded files + 'sources!': [ + 'socket/ssl_client_socket_openssl.cc', + 'socket/ssl_client_socket_openssl.h', + ], + }, + ], [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 'dependencies': [ '../build/linux/system.gyp:gconf', |