diff options
| author | haavardm@opera.com <haavardm@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 16:20:32 +0000 |
|---|---|---|
| committer | haavardm@opera.com <haavardm@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 16:20:32 +0000 |
| commit | e1b2d73a2e4386c4ac1bc20c8920eb2247130adc (patch) | |
| tree | d875cdd58e321790521921b5e967695d4faa0c0a /crypto | |
| parent | 6241d536a509d8c0aca57e542aab0e85ba064c5a (diff) | |
| download | chromium_src-e1b2d73a2e4386c4ac1bc20c8920eb2247130adc.zip chromium_src-e1b2d73a2e4386c4ac1bc20c8920eb2247130adc.tar.gz chromium_src-e1b2d73a2e4386c4ac1bc20c8920eb2247130adc.tar.bz2 | |
Introduce USE_OPENSSL_CERTS for certificate handling.
See discussion at chromium issue 338885.
When USE_OPENSSL_CERTS is defined, X509::OSCertHandle is now
typedef'ed to struct X509*.
When USE_OPENSSL is defined, USE_OPENSSL_CERTS will now be
defined for linux and Android, while being off for Mac and
Windows. This allows OpenSSL to be used while leaving
certificate handling to the OS.
OpenSSL cert verifying code will only be used on Linux.
This patch does not change any default behavior.
Bug=none
Test=none
Review URL: https://codereview.chromium.org/206453002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260152 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/crypto.gyp | 9 | ||||
| -rw-r--r-- | crypto/encryptor.h | 3 | ||||
| -rw-r--r-- | crypto/symmetric_key.h | 3 |
3 files changed, 6 insertions, 9 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index 23b2986..ab19f69 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -80,7 +80,7 @@ 'mac_security_services_lock.h', ], }], - [ 'OS == "mac" or OS == "ios" or OS == "win"', { + [ 'use_openssl == 0 and (OS == "mac" or OS == "ios" or OS == "win")', { 'dependencies': [ '../third_party/nss/nss.gyp:nspr', '../third_party/nss/nss.gyp:nss', @@ -201,12 +201,7 @@ 'openpgp_symmetric_encryption_unittest.cc', ] }], - [ 'OS == "mac" or OS == "ios" or OS == "win"', { - 'dependencies': [ - '../third_party/nss/nss.gyp:nss', - ], - }], - [ 'OS == "mac"', { + [ 'use_openssl == 0 and (OS == "mac" or OS == "ios" or OS == "win")', { 'dependencies': [ '../third_party/nss/nss.gyp:nspr', ], diff --git a/crypto/encryptor.h b/crypto/encryptor.h index bcc647b..ec1498b 100644 --- a/crypto/encryptor.h +++ b/crypto/encryptor.h @@ -13,7 +13,8 @@ #include "build/build_config.h" #include "crypto/crypto_export.h" -#if defined(USE_NSS) || defined(OS_WIN) || defined(OS_MACOSX) +#if defined(USE_NSS) || \ + (!defined(USE_OPENSSL) && (defined(OS_WIN) || defined(OS_MACOSX))) #include "crypto/scoped_nss_types.h" #endif diff --git a/crypto/symmetric_key.h b/crypto/symmetric_key.h index 1d903f1..413f61e 100644 --- a/crypto/symmetric_key.h +++ b/crypto/symmetric_key.h @@ -14,7 +14,8 @@ // See comments for crypto_nacl_win64 in crypto.gyp. // Must test for NACL_WIN64 before OS_WIN since former is a subset of latter. #include "crypto/scoped_capi_types.h" -#elif defined(USE_NSS) || defined(OS_WIN) || defined(OS_MACOSX) +#elif defined(USE_NSS) || \ + (!defined(USE_OPENSSL) && (defined(OS_WIN) || defined(OS_MACOSX))) #include "crypto/scoped_nss_types.h" #endif |