diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-06 15:11:20 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-06 15:11:20 +0000 |
| commit | 97f8852610510096bd46ebf8a96968638e618e6e (patch) | |
| tree | c860812eb137e82250013c201595e01fa21cbd98 /crypto/crypto.gyp | |
| parent | e9576bf0d0be078940d13431e0281ff48c825bb5 (diff) | |
| download | chromium_src-97f8852610510096bd46ebf8a96968638e618e6e.zip chromium_src-97f8852610510096bd46ebf8a96968638e618e6e.tar.gz chromium_src-97f8852610510096bd46ebf8a96968638e618e6e.tar.bz2 | |
crypto: convert OpenPGP code to NSS
(This is a reland of r91350 which was reverted in r91355.)
BUG=none
TEST=crypto_unittests
Review URL: http://codereview.chromium.org/7273080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91559 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/crypto.gyp')
| -rw-r--r-- | crypto/crypto.gyp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index e3d6c84..212df76 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -92,6 +92,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 +107,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 +141,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 +196,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', @@ -230,12 +230,9 @@ }], [ 'use_openssl==1', { 'sources!': [ + 'openpgp_symmetric_encryption_unittest.cc', 'rsa_private_key_nss_unittest.cc', ], - }, { - 'sources!': [ - 'openpgp_symmetric_encryption_test_openssl.cc', - ], }], ], }, |