Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1407)

Unified Diff: crypto/crypto.gyp

Issue 7273080: crypto: convert OpenPGP code to NSS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: crypto/crypto.gyp
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp
index 859fb44ceac6bb2c634bea3e240ae1422f1165cb..4debd44136f66ca014db017c5e472ee710a9fd93 100644
--- a/crypto/crypto.gyp
+++ b/crypto/crypto.gyp
@@ -79,6 +79,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',
@@ -93,7 +94,6 @@
'sources!': [
'encryptor_openssl.cc',
'hmac_openssl.cc',
- 'openpgp_symmetric_encryption_openssl.cc',
'openssl_util.cc',
'openssl_util.h',
'rsa_private_key_openssl.cc',
@@ -128,7 +128,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',
@@ -183,7 +183,7 @@
'signature_creator_unittest.cc',
'signature_verifier_unittest.cc',
'symmetric_key_unittest.cc',
- 'openpgp_symmetric_encryption_test_openssl.cc',
+ 'openpgp_symmetric_encryption_test_nss.cc',
wtc 2011/07/01 18:33:32 This unit test file should be named openpgp_symmet
agl 2011/07/01 20:04:59 Done.
],
'dependencies': [
'crypto',
@@ -217,12 +217,9 @@
}],
[ 'use_openssl==1', {
'sources!': [
+ 'openpgp_symmetric_encryption_test_nss.cc',
'rsa_private_key_nss_unittest.cc',
],
- }, {
- 'sources!': [
- 'openpgp_symmetric_encryption_test_openssl.cc',
- ],
}],
],
},
« no previous file with comments | « no previous file | crypto/openpgp_symmetric_encryption_nss.cc » ('j') | crypto/openpgp_symmetric_encryption_nss.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698