diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-07 13:39:45 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-07 13:39:45 +0000 |
| commit | 9b8c962632b7f107d346f63bfedcb028061da043 (patch) | |
| tree | 8378a4535ce665b96c1414165859b393e7d4cff5 /crypto/crypto.gyp | |
| parent | f9d5d0855d0cdd62e0b1af22797d69cab5a2876d (diff) | |
| download | chromium_src-9b8c962632b7f107d346f63bfedcb028061da043.zip chromium_src-9b8c962632b7f107d346f63bfedcb028061da043.tar.gz chromium_src-9b8c962632b7f107d346f63bfedcb028061da043.tar.bz2 | |
crypto: convert OpenPGP code to NSS
(This is a reland of r91350 which was reverted in r91355 (GYP issue), landed
again in r91559 and reverted again in r91561 (Windows shared build issue).)
BUG=none
TEST=crypto_unittests
http://codereview.chromium.org/7273080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91699 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/crypto.gyp')
| -rw-r--r-- | crypto/crypto.gyp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index e3d6c84..53a41ef5 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -35,6 +35,9 @@ 'sources/': [ ['exclude', '_nss\.cc$'], ], + 'sources!': [ + 'openpgp_symmetric_encryption.cc', + ], }], [ 'OS == "freebsd" or OS == "openbsd"', { 'link_settings': { @@ -92,6 +95,7 @@ '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', @@ -106,7 +110,6 @@ 'sources!': [ 'encryptor_openssl.cc', 'hmac_openssl.cc', - 'openpgp_symmetric_encryption_openssl.cc', 'openssl_util.cc', 'openssl_util.h', 'rsa_private_key_openssl.cc', @@ -141,7 +144,7 @@ 'nss_util.cc', 'nss_util.h', 'nss_util_internal.h', - 'openpgp_symmetric_encryption_openssl.cc', + 'openpgp_symmetric_encryption.cc', 'openpgp_symmetric_encryption.h', 'openssl_util.cc', 'openssl_util.h', @@ -196,7 +199,7 @@ 'signature_creator_unittest.cc', 'signature_verifier_unittest.cc', 'symmetric_key_unittest.cc', - 'openpgp_symmetric_encryption_test_openssl.cc', + 'openpgp_symmetric_encryption_unittest.cc', ], 'dependencies': [ 'crypto', @@ -221,6 +224,7 @@ }, { # os_posix != 1 or OS == "mac" 'sources!': [ 'rsa_private_key_nss_unittest.cc', + 'openpgp_symmetric_encryption_unittest.cc', ] }], [ 'OS == "mac" or OS == "win"', { @@ -230,12 +234,9 @@ }], [ 'use_openssl==1', { 'sources!': [ + 'openpgp_symmetric_encryption_unittest.cc', 'rsa_private_key_nss_unittest.cc', ], - }, { - 'sources!': [ - 'openpgp_symmetric_encryption_test_openssl.cc', - ], }], ], }, |