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

Side by Side Diff: crypto/BUILD.gn

Issue 1106103003: Don't use RSAPrivateKey in NSS integration code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ocsp-refactor
Patch Set: avoid exposing NSS through net headers (unnecessary) 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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/crypto.gni") 5 import("//build/config/crypto.gni")
6 import("//testing/test.gni") 6 import("//testing/test.gni")
7 7
8 component("crypto") { 8 component("crypto") {
9 output_name = "crcrypto" # Avoid colliding with OpenSSL's libcrypto. 9 output_name = "crcrypto" # Avoid colliding with OpenSSL's libcrypto.
10 sources = [ 10 sources = [
(...skipping 30 matching lines...) Expand all
41 "hmac_openssl.cc", 41 "hmac_openssl.cc",
42 "mac_security_services_lock.cc", 42 "mac_security_services_lock.cc",
43 "mac_security_services_lock.h", 43 "mac_security_services_lock.h",
44 44
45 # TODO(brettw) these mocks should be moved to a test_support_crypto target 45 # TODO(brettw) these mocks should be moved to a test_support_crypto target
46 # if possible. 46 # if possible.
47 "mock_apple_keychain.cc", 47 "mock_apple_keychain.cc",
48 "mock_apple_keychain.h", 48 "mock_apple_keychain.h",
49 "mock_apple_keychain_ios.cc", 49 "mock_apple_keychain_ios.cc",
50 "mock_apple_keychain_mac.cc", 50 "mock_apple_keychain_mac.cc",
51 "nss_key_util.cc",
52 "nss_key_util.h",
51 "nss_util.cc", 53 "nss_util.cc",
52 "nss_util.h", 54 "nss_util.h",
53 "nss_util_internal.h", 55 "nss_util_internal.h",
54 "openssl_bio_string.cc", 56 "openssl_bio_string.cc",
55 "openssl_bio_string.h", 57 "openssl_bio_string.h",
56 "openssl_util.cc", 58 "openssl_util.cc",
57 "openssl_util.h", 59 "openssl_util.h",
58 "p224.cc", 60 "p224.cc",
59 "p224.h", 61 "p224.h",
60 "p224_spake.cc", 62 "p224_spake.cc",
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 "openssl_util.cc", 162 "openssl_util.cc",
161 "openssl_util.h", 163 "openssl_util.h",
162 "rsa_private_key_openssl.cc", 164 "rsa_private_key_openssl.cc",
163 "secure_hash_openssl.cc", 165 "secure_hash_openssl.cc",
164 "signature_creator_openssl.cc", 166 "signature_creator_openssl.cc",
165 "signature_verifier_openssl.cc", 167 "signature_verifier_openssl.cc",
166 "symmetric_key_openssl.cc", 168 "symmetric_key_openssl.cc",
167 ] 169 ]
168 } 170 }
169 171
170 # Remove nss_util when NSS is used for neither the internal crypto library 172 # Some files are built when NSS is used at all, either for the internal crypto
171 # nor the platform certificate library. 173 # library or the platform certificate library.
172 if (use_openssl && !use_nss_certs) { 174 if (use_openssl && !use_nss_certs) {
173 sources -= [ 175 sources -= [
176 "nss_key_util.cc",
177 "nss_key_util.h",
174 "nss_util.cc", 178 "nss_util.cc",
175 "nss_util.h", 179 "nss_util.h",
176 "nss_util_internal.h", 180 "nss_util_internal.h",
177 ] 181 ]
178 } 182 }
179 183
180 defines = [ "CRYPTO_IMPLEMENTATION" ] 184 defines = [ "CRYPTO_IMPLEMENTATION" ]
181 } 185 }
182 186
183 # TODO(GYP): TODO(dpranke), fix the compile errors for this stuff 187 # TODO(GYP): TODO(dpranke), fix the compile errors for this stuff
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 test("crypto_unittests") { 219 test("crypto_unittests") {
216 sources = [ 220 sources = [
217 # Tests. 221 # Tests.
218 "curve25519_unittest.cc", 222 "curve25519_unittest.cc",
219 "ec_private_key_unittest.cc", 223 "ec_private_key_unittest.cc",
220 "ec_signature_creator_unittest.cc", 224 "ec_signature_creator_unittest.cc",
221 "encryptor_unittest.cc", 225 "encryptor_unittest.cc",
222 "ghash_unittest.cc", 226 "ghash_unittest.cc",
223 "hkdf_unittest.cc", 227 "hkdf_unittest.cc",
224 "hmac_unittest.cc", 228 "hmac_unittest.cc",
229 "nss_key_util_unittest.cc",
225 "nss_util_unittest.cc", 230 "nss_util_unittest.cc",
226 "openssl_bio_string_unittest.cc", 231 "openssl_bio_string_unittest.cc",
227 "p224_spake_unittest.cc", 232 "p224_spake_unittest.cc",
228 "p224_unittest.cc", 233 "p224_unittest.cc",
229 "random_unittest.cc", 234 "random_unittest.cc",
230 "rsa_private_key_nss_unittest.cc",
231 "rsa_private_key_unittest.cc", 235 "rsa_private_key_unittest.cc",
232 "secure_hash_unittest.cc", 236 "secure_hash_unittest.cc",
233 "sha2_unittest.cc", 237 "sha2_unittest.cc",
234 "signature_creator_unittest.cc", 238 "signature_creator_unittest.cc",
235 "signature_verifier_unittest.cc", 239 "signature_verifier_unittest.cc",
236 "symmetric_key_unittest.cc", 240 "symmetric_key_unittest.cc",
237 ] 241 ]
238 242
239 # Remove nss_util when NSS is used for neither the internal crypto library 243 # Some files are built when NSS is used at all, either for the internal crypto
240 # nor the platform certificate library. 244 # library or the platform certificate library.
241 if (use_openssl && !use_nss_certs) { 245 if (use_openssl && !use_nss_certs) {
242 sources -= [ "nss_util_unittest.cc" ] 246 sources -= [
247 "nss_key_util_unittest.cc",
248 "nss_util_unittest.cc",
249 ]
243 } 250 }
244 251
245 if (use_openssl) { 252 if (!use_openssl) {
246 sources -= [ "rsa_private_key_nss_unittest.cc" ]
247 } else {
248 sources -= [ "openssl_bio_string_unittest.cc" ] 253 sources -= [ "openssl_bio_string_unittest.cc" ]
249 } 254 }
250 255
251 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] 256 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
252 257
253 deps = [ 258 deps = [
254 ":crypto", 259 ":crypto",
255 ":platform", 260 ":platform",
256 ":test_support", 261 ":test_support",
257 "//base", 262 "//base",
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 public_configs += [ "//third_party/nss:system_nss_no_ssl_config" ] 341 public_configs += [ "//third_party/nss:system_nss_no_ssl_config" ]
337 } else { 342 } else {
338 # Non-Linux platforms use the hermetic NSS from the tree. 343 # Non-Linux platforms use the hermetic NSS from the tree.
339 deps += [ 344 deps += [
340 "//third_party/nss:nspr", 345 "//third_party/nss:nspr",
341 "//third_party/nss:nss", 346 "//third_party/nss:nss",
342 ] 347 ]
343 } 348 }
344 } 349 }
345 } 350 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698