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

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
« no previous file with comments | « no previous file | crypto/openpgp_symmetric_encryption_nss.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: crypto/crypto.gyp
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp
index e3d6c84fe4db9814a0d2062c57559926ac339f1c..9340ace6258db7be7a01e4f5e0043891e0d6a507 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',
- ],
}],
],
},
« no previous file with comments | « no previous file | crypto/openpgp_symmetric_encryption_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698