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

Side by Side Diff: net/net.gyp

Issue 881213004: Support building BoringSSL with NSS certificates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sleevi comments, various build and test fixes Created 5 years, 10 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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'conditions': [ 10 'conditions': [
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 ] 197 ]
198 }, { # else 198 }, { # else
199 'sources!': [ 199 'sources!': [
200 'dns/address_sorter_posix.cc', 200 'dns/address_sorter_posix.cc',
201 'dns/address_sorter_posix.h', 201 'dns/address_sorter_posix.h',
202 'dns/dns_client.cc', 202 'dns/dns_client.cc',
203 ], 203 ],
204 }], 204 }],
205 ['use_openssl==1', { 205 ['use_openssl==1', {
206 'sources!': [ 206 'sources!': [
207 'base/crypto_module_nss.cc',
208 'base/keygen_handler_nss.cc',
209 'base/nss_memio.c', 207 'base/nss_memio.c',
210 'base/nss_memio.h', 208 'base/nss_memio.h',
211 'cert/cert_database_nss.cc',
212 'cert/cert_verify_proc_nss.cc',
213 'cert/cert_verify_proc_nss.h',
214 'cert/ct_log_verifier_nss.cc', 209 'cert/ct_log_verifier_nss.cc',
215 'cert/ct_objects_extractor_nss.cc', 210 'cert/ct_objects_extractor_nss.cc',
216 'cert/jwk_serializer_nss.cc', 211 'cert/jwk_serializer_nss.cc',
217 'cert/nss_cert_database.cc',
218 'cert/nss_cert_database.h',
219 'cert/nss_cert_database_chromeos.cc',
220 'cert/nss_cert_database_chromeos.h',
221 'cert/nss_profile_filter_chromeos.cc', 212 'cert/nss_profile_filter_chromeos.cc',
222 'cert/nss_profile_filter_chromeos.h', 213 'cert/nss_profile_filter_chromeos.h',
223 'cert/scoped_nss_types.h', 214 'cert/scoped_nss_types.h',
224 'cert/sha256_legacy_support_nss_win.cc',
225 'cert/test_root_certs_nss.cc',
226 'cert/x509_certificate_nss.cc',
227 'cert/x509_util_nss.cc', 215 'cert/x509_util_nss.cc',
228 'cert/x509_util_nss.h',
229 'ocsp/nss_ocsp.cc',
230 'ocsp/nss_ocsp.h',
231 'quic/crypto/aead_base_decrypter_nss.cc', 216 'quic/crypto/aead_base_decrypter_nss.cc',
232 'quic/crypto/aead_base_encrypter_nss.cc', 217 'quic/crypto/aead_base_encrypter_nss.cc',
233 'quic/crypto/aes_128_gcm_12_decrypter_nss.cc', 218 'quic/crypto/aes_128_gcm_12_decrypter_nss.cc',
234 'quic/crypto/aes_128_gcm_12_encrypter_nss.cc', 219 'quic/crypto/aes_128_gcm_12_encrypter_nss.cc',
235 'quic/crypto/chacha20_poly1305_decrypter_nss.cc', 220 'quic/crypto/chacha20_poly1305_decrypter_nss.cc',
236 'quic/crypto/chacha20_poly1305_encrypter_nss.cc', 221 'quic/crypto/chacha20_poly1305_encrypter_nss.cc',
237 'quic/crypto/channel_id_nss.cc', 222 'quic/crypto/channel_id_nss.cc',
238 'quic/crypto/p256_key_exchange_nss.cc', 223 'quic/crypto/p256_key_exchange_nss.cc',
239 'socket/nss_ssl_util.cc', 224 'socket/nss_ssl_util.cc',
240 'socket/nss_ssl_util.h', 225 'socket/nss_ssl_util.h',
241 'socket/ssl_client_socket_nss.cc', 226 'socket/ssl_client_socket_nss.cc',
242 'socket/ssl_client_socket_nss.h', 227 'socket/ssl_client_socket_nss.h',
243 'socket/ssl_server_socket_nss.cc', 228 'socket/ssl_server_socket_nss.cc',
244 'socket/ssl_server_socket_nss.h', 229 'socket/ssl_server_socket_nss.h',
245 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
246 'third_party/mozilla_security_manager/nsKeygenHandler.h',
247 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
248 'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
249 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
250 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
251 ], 230 ],
252 'dependencies': [ 231 'dependencies': [
253 '../third_party/boringssl/boringssl.gyp:boringssl', 232 '../third_party/boringssl/boringssl.gyp:boringssl',
254 ], 233 ],
255 }, 234 },
256 { # else !use_openssl: remove the unneeded files and depend on NSS. 235 { # else !use_openssl: remove the unneeded files and depend on NSS.
257 'sources!': [ 236 'sources!': [
258 'base/crypto_module_openssl.cc',
259 'cert/ct_log_verifier_openssl.cc', 237 'cert/ct_log_verifier_openssl.cc',
260 'cert/ct_objects_extractor_openssl.cc', 238 'cert/ct_objects_extractor_openssl.cc',
261 'cert/jwk_serializer_openssl.cc', 239 'cert/jwk_serializer_openssl.cc',
262 'cert/sha256_legacy_support_openssl_win.cc', 240 'cert/sha256_legacy_support_openssl_win.cc',
263 'cert/x509_util_openssl.cc', 241 'cert/x509_util_openssl.cc',
264 'cert/x509_util_openssl.h', 242 'cert/x509_util_openssl.h',
265 'quic/crypto/aead_base_decrypter_openssl.cc', 243 'quic/crypto/aead_base_decrypter_openssl.cc',
266 'quic/crypto/aead_base_encrypter_openssl.cc', 244 'quic/crypto/aead_base_encrypter_openssl.cc',
267 'quic/crypto/aes_128_gcm_12_decrypter_openssl.cc', 245 'quic/crypto/aes_128_gcm_12_decrypter_openssl.cc',
268 'quic/crypto/aes_128_gcm_12_encrypter_openssl.cc', 246 'quic/crypto/aes_128_gcm_12_encrypter_openssl.cc',
269 'quic/crypto/chacha20_poly1305_decrypter_openssl.cc', 247 'quic/crypto/chacha20_poly1305_decrypter_openssl.cc',
270 'quic/crypto/chacha20_poly1305_encrypter_openssl.cc', 248 'quic/crypto/chacha20_poly1305_encrypter_openssl.cc',
271 'quic/crypto/channel_id_openssl.cc', 249 'quic/crypto/channel_id_openssl.cc',
272 'quic/crypto/p256_key_exchange_openssl.cc', 250 'quic/crypto/p256_key_exchange_openssl.cc',
273 'quic/crypto/scoped_evp_aead_ctx.cc', 251 'quic/crypto/scoped_evp_aead_ctx.cc',
274 'quic/crypto/scoped_evp_aead_ctx.h', 252 'quic/crypto/scoped_evp_aead_ctx.h',
275 'socket/ssl_client_socket_openssl.cc', 253 'socket/ssl_client_socket_openssl.cc',
276 'socket/ssl_client_socket_openssl.h', 254 'socket/ssl_client_socket_openssl.h',
277 'socket/ssl_server_socket_openssl.cc', 255 'socket/ssl_server_socket_openssl.cc',
278 'socket/ssl_server_socket_openssl.h', 256 'socket/ssl_server_socket_openssl.h',
279 'socket/ssl_session_cache_openssl.cc', 257 'socket/ssl_session_cache_openssl.cc',
280 'socket/ssl_session_cache_openssl.h', 258 'socket/ssl_session_cache_openssl.h',
281 'ssl/openssl_platform_key.h', 259 'ssl/openssl_platform_key.h',
282 'ssl/openssl_platform_key_mac.cc', 260 'ssl/openssl_platform_key_mac.cc',
261 'ssl/openssl_platform_key_nss.cc',
283 'ssl/openssl_platform_key_win.cc', 262 'ssl/openssl_platform_key_win.cc',
284 'ssl/openssl_ssl_util.cc', 263 'ssl/openssl_ssl_util.cc',
285 'ssl/openssl_ssl_util.h', 264 'ssl/openssl_ssl_util.h',
286 ], 265 ],
266 },
267 ],
268 [ 'use_nss == 1 or OS == "ios" or use_openssl == 0', {
287 'conditions': [ 269 'conditions': [
288 # Pull in the bundled or system NSS as appropriate. 270 # Pull in the bundled or system NSS as appropriate.
289 [ 'desktop_linux == 1 or chromeos == 1', { 271 [ 'desktop_linux == 1 or chromeos == 1', {
290 'dependencies': [ 272 'dependencies': [
291 '../build/linux/system.gyp:ssl', 273 '../build/linux/system.gyp:ssl',
292 ], 274 ],
293 }, { 275 }, {
294 'dependencies': [ 276 'dependencies': [
295 '../third_party/nss/nss.gyp:nspr', 277 '../third_party/nss/nss.gyp:nspr',
296 '../third_party/nss/nss.gyp:nss', 278 '../third_party/nss/nss.gyp:nss',
297 'third_party/nss/ssl.gyp:libssl', 279 'third_party/nss/ssl.gyp:libssl',
298 ], 280 ],
299 }] 281 }]
300 ], 282 ],
301 }, 283 }, {
302 ], 284 'sources!': [
285 'cert/x509_util_nss.h',
286 ],
287 }],
303 [ 'use_openssl_certs == 0', { 288 [ 'use_openssl_certs == 0', {
304 'sources!': [ 289 'sources!': [
290 'base/crypto_module_openssl.cc',
305 'base/keygen_handler_openssl.cc', 291 'base/keygen_handler_openssl.cc',
306 'base/openssl_private_key_store.h', 292 'base/openssl_private_key_store.h',
307 'base/openssl_private_key_store_android.cc', 293 'base/openssl_private_key_store_android.cc',
308 'base/openssl_private_key_store_memory.cc', 294 'base/openssl_private_key_store_memory.cc',
309 'cert/cert_database_openssl.cc', 295 'cert/cert_database_openssl.cc',
310 'cert/cert_verify_proc_openssl.cc', 296 'cert/cert_verify_proc_openssl.cc',
311 'cert/cert_verify_proc_openssl.h', 297 'cert/cert_verify_proc_openssl.h',
312 'cert/test_root_certs_openssl.cc', 298 'cert/test_root_certs_openssl.cc',
313 'cert/x509_certificate_openssl.cc', 299 'cert/x509_certificate_openssl.cc',
314 'ssl/openssl_client_key_store.cc', 300 'ssl/openssl_client_key_store.cc',
(...skipping 21 matching lines...) Expand all
336 }], 322 }],
337 ['OS=="solaris"', { 323 ['OS=="solaris"', {
338 'link_settings': { 324 'link_settings': {
339 'ldflags': [ 325 'ldflags': [
340 '-R/usr/lib/mps', 326 '-R/usr/lib/mps',
341 ], 327 ],
342 }, 328 },
343 }], 329 }],
344 ], 330 ],
345 }, 331 },
346 { # else: OS is not in the above list 332 ],
333 [ 'use_nss != 1', {
347 'sources!': [ 334 'sources!': [
348 'base/crypto_module_nss.cc', 335 'base/crypto_module_nss.cc',
349 'base/keygen_handler_nss.cc', 336 'base/keygen_handler_nss.cc',
350 'cert/cert_database_nss.cc', 337 'cert/cert_database_nss.cc',
338 'cert/cert_verify_proc_nss.cc',
339 'cert/cert_verify_proc_nss.h',
351 'cert/nss_cert_database.cc', 340 'cert/nss_cert_database.cc',
352 'cert/nss_cert_database.h', 341 'cert/nss_cert_database.h',
342 'ssl/openssl_platform_key_nss.cc',
353 'cert/test_root_certs_nss.cc', 343 'cert/test_root_certs_nss.cc',
354 'cert/x509_certificate_nss.cc', 344 'cert/x509_certificate_nss.cc',
345 'cert/x509_util_nss_certs.cc',
355 'ocsp/nss_ocsp.cc', 346 'ocsp/nss_ocsp.cc',
356 'ocsp/nss_ocsp.h', 347 'ocsp/nss_ocsp.h',
348 'ssl/client_cert_store_chromeos.cc',
349 'ssl/client_cert_store_chromeos.h',
350 'ssl/client_cert_store_nss.cc',
351 'ssl/client_cert_store_nss.h',
357 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', 352 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
358 'third_party/mozilla_security_manager/nsKeygenHandler.h', 353 'third_party/mozilla_security_manager/nsKeygenHandler.h',
359 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', 354 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
360 'third_party/mozilla_security_manager/nsNSSCertificateDB.h', 355 'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
361 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', 356 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
362 'third_party/mozilla_security_manager/nsPKCS12Blob.h', 357 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
363 ], 358 ],
364 }, 359 }],
365 ], 360 # client_cert_store_nss.c requires NSS_CmpCertChainWCANames from NSS's
366 [ 'use_nss != 1', { 361 # libssl, but our bundled copy is not built in OpenSSL ports. Pull that
367 'sources!': [ 362 # file in directly.
368 'cert/cert_verify_proc_nss.cc', 363 [ 'use_nss == 1 and use_openssl == 1', {
369 'cert/cert_verify_proc_nss.h', 364 'sources': [
370 'ssl/client_cert_store_chromeos.cc', 365 'third_party/nss/ssl/cmpcert.c',
371 'ssl/client_cert_store_chromeos.h',
372 'ssl/client_cert_store_nss.cc',
373 'ssl/client_cert_store_nss.h',
374 ], 366 ],
375 }], 367 }],
376 [ 'enable_websockets != 1', { 368 [ 'enable_websockets != 1', {
377 'sources/': [ 369 'sources/': [
378 ['exclude', '^websockets/'], 370 ['exclude', '^websockets/'],
379 ], 371 ],
380 }], 372 }],
381 [ 'enable_mdns != 1', { 373 [ 'enable_mdns != 1', {
382 'sources!' : [ 374 'sources!' : [
383 'dns/mdns_cache.cc', 375 'dns/mdns_cache.cc',
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 ['include', '^base/net_util_mac\\.h$'], 494 ['include', '^base/net_util_mac\\.h$'],
503 ['include', '^base/network_change_notifier_mac\\.cc$'], 495 ['include', '^base/network_change_notifier_mac\\.cc$'],
504 ['include', '^base/network_config_watcher_mac\\.cc$'], 496 ['include', '^base/network_config_watcher_mac\\.cc$'],
505 ['include', '^base/platform_mime_util_mac\\.mm$'], 497 ['include', '^base/platform_mime_util_mac\\.mm$'],
506 # The iOS implementation only partially uses NSS and thus does not 498 # The iOS implementation only partially uses NSS and thus does not
507 # defines |use_nss|. In particular the |USE_NSS| preprocessor 499 # defines |use_nss|. In particular the |USE_NSS| preprocessor
508 # definition is not used. The following files are needed though: 500 # definition is not used. The following files are needed though:
509 ['include', '^cert/cert_verify_proc_nss\\.cc$'], 501 ['include', '^cert/cert_verify_proc_nss\\.cc$'],
510 ['include', '^cert/cert_verify_proc_nss\\.h$'], 502 ['include', '^cert/cert_verify_proc_nss\\.h$'],
511 ['include', '^cert/test_root_certs_nss\\.cc$'], 503 ['include', '^cert/test_root_certs_nss\\.cc$'],
512 ['include', '^cert/x509_util_nss\\.cc$'], 504 ['include', '^cert/x509_util_nss_certs\\.cc$'],
513 ['include', '^cert/x509_util_nss\\.h$'],
514 ['include', '^proxy/proxy_resolver_mac\\.cc$'], 505 ['include', '^proxy/proxy_resolver_mac\\.cc$'],
515 ['include', '^proxy/proxy_server_mac\\.cc$'], 506 ['include', '^proxy/proxy_server_mac\\.cc$'],
516 ['include', '^ocsp/nss_ocsp\\.cc$'], 507 ['include', '^ocsp/nss_ocsp\\.cc$'],
517 ['include', '^ocsp/nss_ocsp\\.h$'], 508 ['include', '^ocsp/nss_ocsp\\.h$'],
518 ], 509 ],
519 }], 510 }],
520 ], 511 ],
521 }, 512 },
522 { 513 {
523 'target_name': 'net_unittests', 514 'target_name': 'net_unittests',
(...skipping 1284 matching lines...) Expand 10 before | Expand all | Expand 10 after
1808 '../build/isolate.gypi', 1799 '../build/isolate.gypi',
1809 ], 1800 ],
1810 'sources': [ 1801 'sources': [
1811 'net_unittests.isolate', 1802 'net_unittests.isolate',
1812 ], 1803 ],
1813 }, 1804 },
1814 ], 1805 ],
1815 }], 1806 }],
1816 ], 1807 ],
1817 } 1808 }
OLDNEW
« no previous file with comments | « net/cert/x509_util_nss_certs.cc ('k') | net/net.gypi » ('j') | net/ssl/channel_id_service.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698