diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-06 15:23:02 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-06 15:23:02 +0000 |
| commit | b00a46023e5ca59e7ec7d4cee84fb1aaf416f0e8 (patch) | |
| tree | 5338b22f073c4a9b329b04b53916ba6451d07617 /crypto/crypto.gyp | |
| parent | 51aa0dde5ac8945cebcfa6b183ab644c5ded9a07 (diff) | |
| download | chromium_src-b00a46023e5ca59e7ec7d4cee84fb1aaf416f0e8.zip chromium_src-b00a46023e5ca59e7ec7d4cee84fb1aaf416f0e8.tar.gz chromium_src-b00a46023e5ca59e7ec7d4cee84fb1aaf416f0e8.tar.bz2 | |
Revert "crypto: convert OpenPGP code to NSS"
This reverts commit r91559. Broke the Windows shared build.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91561 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/crypto.gyp')
| -rw-r--r-- | crypto/crypto.gyp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index 212df76..e3d6c84 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -92,7 +92,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', @@ -107,6 +106,7 @@ '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.cc', + 'openpgp_symmetric_encryption_openssl.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_unittest.cc', + 'openpgp_symmetric_encryption_test_openssl.cc', ], 'dependencies': [ 'crypto', @@ -230,9 +230,12 @@ }], [ 'use_openssl==1', { 'sources!': [ - 'openpgp_symmetric_encryption_unittest.cc', 'rsa_private_key_nss_unittest.cc', ], + }, { + 'sources!': [ + 'openpgp_symmetric_encryption_test_openssl.cc', + ], }], ], }, |