diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-30 20:40:53 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-30 20:40:53 +0000 |
| commit | 644bdcae0edf0cfa3ac9644edf3b52a0d3162489 (patch) | |
| tree | 64b3ab5519929c10d59e3b58f4415ffdafcde2c8 /base | |
| parent | 48f619d8bd9a264f14ce4b62a935e05df015432b (diff) | |
| download | chromium_src-644bdcae0edf0cfa3ac9644edf3b52a0d3162489.zip chromium_src-644bdcae0edf0cfa3ac9644edf3b52a0d3162489.tar.gz chromium_src-644bdcae0edf0cfa3ac9644edf3b52a0d3162489.tar.bz2 | |
Linux: add next-protocol-negotiation to libssl.
This is an experimental, client only implementation of
next-protocol-negotiation:
http://www.imperialviolet.org/binary/draft-agl-tls-nextprotoneg-00.html
This only affects the internal copy of libssl and is only active when
built with use_system_ssl=0, which is not currently the default.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33327 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/nss_init.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/base/nss_init.cc b/base/nss_init.cc index 24e3203..015adae 100644 --- a/base/nss_init.cc +++ b/base/nss_init.cc @@ -115,6 +115,7 @@ class NSSInitSingleton { NSS_SetDomesticPolicy(); +#if defined(USE_SYSTEM_SSL) // Use late binding to avoid scary but benign warning // "Symbol `SSL_ImplementedCiphers' has different size in shared object, // consider re-linking" @@ -124,6 +125,9 @@ class NSSInitSingleton { NOTREACHED() << "Can't get list of supported ciphers"; return; } +#else +#define pSSL_ImplementedCiphers SSL_ImplementedCiphers +#endif // Explicitly enable exactly those ciphers with keys of at least 80 bits for (int i = 0; i < SSL_NumImplementedCiphers; i++) { |