diff options
Diffstat (limited to 'chromium/crypto/crypto.gyp')
| -rw-r--r-- | chromium/crypto/crypto.gyp | 138 |
1 files changed, 22 insertions, 116 deletions
diff --git a/chromium/crypto/crypto.gyp b/chromium/crypto/crypto.gyp index c9329463609..0c472ffc2eb 100644 --- a/chromium/crypto/crypto.gyp +++ b/chromium/crypto/crypto.gyp @@ -5,20 +5,10 @@ { 'variables': { 'chromium_code': 1, - # Put all transitive dependencies for Windows HMAC here. - # This is required so that we can build them for nacl win64. - 'hmac_win64_related_sources': [ - 'hmac.cc', - 'hmac.h', - 'hmac_win.cc', - 'secure_util.cc', - 'secure_util.h', - 'symmetric_key.h', - 'symmetric_key_win.cc', - 'third_party/nss/chromium-sha256.h', - 'third_party/nss/sha512.cc', - ], }, + 'includes': [ + 'crypto.gypi', + ], 'targets': [ { 'target_name': 'crypto', @@ -51,8 +41,6 @@ }, { # os_posix != 1 or OS == "mac" or OS == "ios" or OS == "android" 'sources!': [ 'hmac_win.cc', - 'openpgp_symmetric_encryption.cc', - 'openpgp_symmetric_encryption.h', 'symmetric_key_win.cc', ], }], @@ -64,17 +52,6 @@ ], }], [ 'OS == "android"', { - 'dependencies': [ - '../third_party/openssl/openssl.gyp:openssl', - ], - '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$'], - ], 'includes': [ '../build/android/cpufeatures.gypi', ], @@ -101,7 +78,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', @@ -122,6 +99,9 @@ 'msvs_disabled_warnings': [4267, ], }], [ 'use_openssl==1', { + 'dependencies': [ + '../third_party/openssl/openssl.gyp:openssl', + ], # TODO(joth): Use a glob to match exclude patterns once the # OpenSSL file set is complete. 'sources!': [ @@ -131,7 +111,6 @@ 'hmac_nss.cc', 'nss_util.cc', 'nss_util.h', - 'openpgp_symmetric_encryption.cc', 'rsa_private_key_nss.cc', 'secure_hash_default.cc', 'signature_creator_nss.cc', @@ -140,6 +119,7 @@ 'third_party/nss/chromium-blapi.h', 'third_party/nss/chromium-blapit.h', 'third_party/nss/chromium-nss.h', + 'third_party/nss/chromium-prtypes.h', 'third_party/nss/chromium-sha256.h', 'third_party/nss/pk11akey.cc', 'third_party/nss/rsawrapr.c', @@ -152,6 +132,8 @@ 'ec_signature_creator_openssl.cc', 'encryptor_openssl.cc', 'hmac_openssl.cc', + 'openssl_bio_string.cc', + 'openssl_bio_string.h', 'openssl_util.cc', 'openssl_util.h', 'rsa_private_key_openssl.cc', @@ -163,83 +145,7 @@ },], ], 'sources': [ - # NOTE: all transitive dependencies of HMAC on windows need - # to be placed in the source list above. - '<@(hmac_win64_related_sources)', - 'apple_keychain.h', - 'apple_keychain_ios.mm', - 'apple_keychain_mac.mm', - 'capi_util.cc', - 'capi_util.h', - 'crypto_export.h', - 'cssm_init.cc', - 'cssm_init.h', - 'curve25519.cc', - 'curve25519.h', - 'curve25519-donna.c', - 'ghash.cc', - 'ghash.h', - 'ec_private_key.h', - 'ec_private_key_nss.cc', - 'ec_private_key_openssl.cc', - 'ec_signature_creator.cc', - 'ec_signature_creator.h', - 'ec_signature_creator_impl.h', - 'ec_signature_creator_nss.cc', - 'ec_signature_creator_openssl.cc', - 'encryptor.cc', - 'encryptor.h', - 'encryptor_nss.cc', - 'encryptor_openssl.cc', - 'hkdf.cc', - 'hkdf.h', - 'hmac_nss.cc', - 'hmac_openssl.cc', - 'mac_security_services_lock.cc', - 'mac_security_services_lock.h', - 'mock_apple_keychain.cc', - 'mock_apple_keychain.h', - 'mock_apple_keychain_ios.cc', - 'mock_apple_keychain_mac.cc', - 'p224_spake.cc', - 'p224_spake.h', - 'nss_crypto_module_delegate.h', - 'nss_util.cc', - 'nss_util.h', - 'nss_util_internal.h', - 'openpgp_symmetric_encryption.cc', - 'openpgp_symmetric_encryption.h', - 'openssl_util.cc', - 'openssl_util.h', - 'p224.cc', - 'p224.h', - 'random.h', - 'random.cc', - 'rsa_private_key.cc', - 'rsa_private_key.h', - 'rsa_private_key_nss.cc', - 'rsa_private_key_openssl.cc', - 'scoped_capi_types.h', - 'scoped_nss_types.h', - 'secure_hash.h', - 'secure_hash_default.cc', - 'secure_hash_openssl.cc', - 'sha2.cc', - 'sha2.h', - 'signature_creator.h', - 'signature_creator_nss.cc', - 'signature_creator_openssl.cc', - 'signature_verifier.h', - 'signature_verifier_nss.cc', - 'signature_verifier_openssl.cc', - 'symmetric_key_nss.cc', - 'symmetric_key_openssl.cc', - 'third_party/nss/chromium-blapi.h', - 'third_party/nss/chromium-blapit.h', - 'third_party/nss/chromium-nss.h', - 'third_party/nss/pk11akey.cc', - 'third_party/nss/rsawrapr.c', - 'third_party/nss/secsign.cc', + '<@(crypto_sources)', ], }, { @@ -254,6 +160,7 @@ 'hkdf_unittest.cc', 'hmac_unittest.cc', 'nss_util_unittest.cc', + 'openssl_bio_string_unittest.cc', 'p224_unittest.cc', 'p224_spake_unittest.cc', 'random_unittest.cc', @@ -264,7 +171,6 @@ 'signature_creator_unittest.cc', 'signature_verifier_unittest.cc', 'symmetric_key_unittest.cc', - 'openpgp_symmetric_encryption_unittest.cc', ], 'dependencies': [ 'crypto', @@ -277,7 +183,7 @@ 'conditions': [ [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { 'conditions': [ - [ 'linux_use_tcmalloc==1', { + [ 'use_allocator!="none"', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', ], @@ -290,15 +196,9 @@ }, { # os_posix != 1 or OS == "mac" or OS == "android" or OS == "ios" 'sources!': [ 'rsa_private_key_nss_unittest.cc', - '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', ], @@ -308,11 +208,17 @@ 'msvs_disabled_warnings': [4267, ], }], [ 'use_openssl==1', { + 'dependencies': [ + '../third_party/openssl/openssl.gyp:openssl', + ], 'sources!': [ 'nss_util_unittest.cc', - 'openpgp_symmetric_encryption_unittest.cc', 'rsa_private_key_nss_unittest.cc', ], + }, { + 'sources!': [ + 'openssl_bio_string_unittest.cc', + ], }], ], }, @@ -327,7 +233,7 @@ # for the helper. 'type': '<(component)', 'dependencies': [ - '../base/base.gyp:base_nacl_win64', + '../base/base.gyp:base_win64', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64', ], 'sources': [ |