summaryrefslogtreecommitdiffstats
path: root/crypto/crypto.gyp
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-01 20:17:18 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-01 20:17:18 +0000
commit8466b3fc7f259a110f0f300781237f355e24a424 (patch)
tree9aa9ef366ab1fd55f783e82fca11742382f5a0bd /crypto/crypto.gyp
parent1fbf0bb88f47083adcab58bdd432f4cf208b08f7 (diff)
downloadchromium_src-8466b3fc7f259a110f0f300781237f355e24a424.zip
chromium_src-8466b3fc7f259a110f0f300781237f355e24a424.tar.gz
chromium_src-8466b3fc7f259a110f0f300781237f355e24a424.tar.bz2
crypto: convert OpenPGP code to NSS
BUG=none TEST=crypto_unittests Review URL: http://codereview.chromium.org/7273080 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91350 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/crypto.gyp')
-rw-r--r--crypto/crypto.gyp11
1 files changed, 4 insertions, 7 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp
index e3d6c84..9340ace 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_nss.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_nss.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_nss_unittest.cc',
],
'dependencies': [
'crypto',
@@ -230,12 +230,9 @@
}],
[ 'use_openssl==1', {
'sources!': [
+ 'openpgp_symmetric_encryption_test_nss.cc',
'rsa_private_key_nss_unittest.cc',
],
- }, {
- 'sources!': [
- 'openpgp_symmetric_encryption_test_openssl.cc',
- ],
}],
],
},