diff options
| author | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 08:11:52 +0000 |
|---|---|---|
| committer | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 08:11:52 +0000 |
| commit | 45a445210f04343da2a29d4f08e8cea905925b33 (patch) | |
| tree | be93e5caef6cca72af3192bf3892e2a82fe8a8c0 /crypto/crypto.gyp | |
| parent | 8368a0a348e5e445cefbee7fec023a988f21fa75 (diff) | |
| download | chromium_src-45a445210f04343da2a29d4f08e8cea905925b33.zip chromium_src-45a445210f04343da2a29d4f08e8cea905925b33.tar.gz chromium_src-45a445210f04343da2a29d4f08e8cea905925b33.tar.bz2 | |
Use NSS for symmetric key crypto operations on Windows and Mac.
Encryptor, HMAC, and SymmetricKey now use NSS on all platforms except Android.
This allows us to use them inside the sandbox, something that was not possible
when using the platform APIs.
On Windows, Native Client 64-bit builds still use the the platform APIs.
BUG=127803,124741
TEST=Existing tests since there is no change in functionality.
Review URL: https://chromiumcodereview.appspot.com/10543146
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142356 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/crypto.gyp')
| -rw-r--r-- | crypto/crypto.gyp | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index fdc0fa9..287b53c 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -53,10 +53,16 @@ ['exclude', '_nss\.cc$'], ['include', 'ec_private_key_nss\.cc$'], ['include', 'ec_signature_creator_nss\.cc$'], + ['include', 'encryptor_nss\.cc$'], + ['include', 'hmac_nss\.cc$'], ['include', 'signature_verifier_nss\.cc$'], + ['include', 'symmetric_key_nss\.cc$'], ], 'sources!': [ + 'hmac_win.cc', 'openpgp_symmetric_encryption.cc', + 'openpgp_symmetric_encryption.h', + 'symmetric_key_win.cc', ], }], [ 'OS == "android"', { @@ -66,7 +72,10 @@ 'sources/': [ ['exclude', 'ec_private_key_nss\.cc$'], ['exclude', 'ec_signature_creator_nss\.cc$'], + ['exclude', 'encryptor_nss\.cc$'], + ['exclude', 'hmac_nss\.cc$'], ['exclude', 'signature_verifier_nss\.cc$'], + ['exclude', 'symmetric_key_nss\.cc$'], ], }], [ 'os_bsd==1', { @@ -96,6 +105,10 @@ '../third_party/nss/nss.gyp:nspr', '../third_party/nss/nss.gyp:nss', ], + 'export_dependent_settings': [ + '../third_party/nss/nss.gyp:nspr', + '../third_party/nss/nss.gyp:nss', + ], }], [ 'OS != "win"', { 'sources!': [ @@ -163,11 +176,8 @@ 'ec_signature_creator_openssl.cc', 'encryptor.cc', 'encryptor.h', - 'encryptor_mac.cc', 'encryptor_nss.cc', 'encryptor_openssl.cc', - 'encryptor_win.cc', - 'hmac_mac.cc', 'hmac_nss.cc', 'hmac_openssl.cc', 'keychain_mac.cc', @@ -208,7 +218,6 @@ 'signature_verifier.h', 'signature_verifier_nss.cc', 'signature_verifier_openssl.cc', - 'symmetric_key_mac.cc', 'symmetric_key_nss.cc', 'symmetric_key_openssl.cc', 'third_party/nss/chromium-blapi.h', @@ -293,6 +302,9 @@ 'targets': [ { 'target_name': 'crypto_nacl_win64', + # We do not want nacl_helper to depend on NSS because this would + # require including a 64-bit copy of NSS. Thus, use the native APIs + # for the helper. 'type': '<(component)', 'dependencies': [ '../base/base.gyp:base_nacl_win64', @@ -303,6 +315,7 @@ ], 'defines': [ 'CRYPTO_IMPLEMENTATION', + '<@(nacl_win64_defines)', ], 'msvs_disabled_warnings': [ 4018, |