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

Unified Diff: crypto/crypto.gyp

Issue 1118263003: Revert of Don't use RSAPrivateKey in NSS integration code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ocsp-refactor
Patch Set: Created 5 years, 8 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 | « crypto/BUILD.gn ('k') | crypto/crypto.gypi » ('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 e6bff0b098b75bb225bbf5972dde514f292b41d3..00b59b5cce1dbb2c1aa693eacca5be6baffbcaed 100644
--- a/crypto/crypto.gyp
+++ b/crypto/crypto.gyp
@@ -143,11 +143,9 @@
],
},],
[ 'use_openssl==1 and use_nss_certs==0', {
- # Some files are built when NSS is used at all, either for the
- # internal crypto library or the platform certificate library.
+ # NSS is used for neither the internal crypto library nor the
+ # platform certificate library.
'sources!': [
- 'nss_key_util.cc',
- 'nss_key_util.h',
'nss_util.cc',
'nss_util.h',
'nss_util_internal.h',
@@ -170,13 +168,13 @@
'ghash_unittest.cc',
'hkdf_unittest.cc',
'hmac_unittest.cc',
- 'nss_key_util_unittest.cc',
'nss_util_unittest.cc',
'openssl_bio_string_unittest.cc',
'p224_unittest.cc',
'p224_spake_unittest.cc',
'random_unittest.cc',
'rsa_private_key_unittest.cc',
+ 'rsa_private_key_nss_unittest.cc',
'secure_hash_unittest.cc',
'sha2_unittest.cc',
'signature_creator_unittest.cc',
@@ -207,10 +205,9 @@
],
}],
[ 'use_openssl == 1 and use_nss_certs == 0', {
- # Some files are built when NSS is used at all, either for the
- # internal crypto library or the platform certificate library.
- 'sources!': [
- 'nss_key_util_unittest.cc',
+ # nss_util is built if NSS is used for either the internal crypto
+ # library or the platform certificate library.
+ 'sources!': [
'nss_util_unittest.cc',
],
}],
@@ -226,6 +223,9 @@
[ 'use_openssl==1', {
'dependencies': [
'../third_party/boringssl/boringssl.gyp:boringssl',
+ ],
+ 'sources!': [
+ 'rsa_private_key_nss_unittest.cc',
],
}, {
'sources!': [
« no previous file with comments | « crypto/BUILD.gn ('k') | crypto/crypto.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698