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

Side by Side Diff: net/net.gyp

Issue 206453002: Introduce USE_OPENSSL_CERTS for certificate handling. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Final fixes and nits Created 6 years, 9 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
« no previous file with comments | « net/cert/x509_certificate.h ('k') | net/socket/ssl_client_socket_openssl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 'use_tracing_cache_backend%': 0, 10 'use_tracing_cache_backend%': 0,
(...skipping 1397 matching lines...) Expand 10 before | Expand all | Expand 10 after
1408 'socket/ssl_client_socket_nss.h', 1408 'socket/ssl_client_socket_nss.h',
1409 'socket/ssl_server_socket_nss.cc', 1409 'socket/ssl_server_socket_nss.cc',
1410 'socket/ssl_server_socket_nss.h', 1410 'socket/ssl_server_socket_nss.h',
1411 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', 1411 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
1412 'third_party/mozilla_security_manager/nsKeygenHandler.h', 1412 'third_party/mozilla_security_manager/nsKeygenHandler.h',
1413 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', 1413 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
1414 'third_party/mozilla_security_manager/nsNSSCertificateDB.h', 1414 'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
1415 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', 1415 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
1416 'third_party/mozilla_security_manager/nsPKCS12Blob.h', 1416 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
1417 ], 1417 ],
1418 'dependencies': [
1419 '../third_party/openssl/openssl.gyp:openssl',
1420 ],
1418 }, 1421 },
1419 { # else !use_openssl: remove the unneeded files 1422 { # else !use_openssl: remove the unneeded files
1420 'sources!': [ 1423 'sources!': [
1421 'base/crypto_module_openssl.cc', 1424 'base/crypto_module_openssl.cc',
1422 'base/keygen_handler_openssl.cc', 1425 'base/keygen_handler_openssl.cc',
1423 'base/openssl_private_key_store.h',
1424 'base/openssl_private_key_store_android.cc',
1425 'base/openssl_private_key_store_memory.cc',
1426 'cert/cert_database_openssl.cc',
1427 'cert/cert_verify_proc_openssl.cc',
1428 'cert/cert_verify_proc_openssl.h',
1429 'cert/ct_log_verifier_openssl.cc', 1426 'cert/ct_log_verifier_openssl.cc',
1430 'cert/ct_objects_extractor_openssl.cc', 1427 'cert/ct_objects_extractor_openssl.cc',
1431 'cert/jwk_serializer_openssl.cc', 1428 'cert/jwk_serializer_openssl.cc',
1432 'cert/test_root_certs_openssl.cc',
1433 'cert/x509_certificate_openssl.cc',
1434 'cert/x509_util_openssl.cc', 1429 'cert/x509_util_openssl.cc',
1435 'cert/x509_util_openssl.h', 1430 'cert/x509_util_openssl.h',
1436 'quic/crypto/aead_base_decrypter_openssl.cc', 1431 'quic/crypto/aead_base_decrypter_openssl.cc',
1437 'quic/crypto/aead_base_encrypter_openssl.cc', 1432 'quic/crypto/aead_base_encrypter_openssl.cc',
1438 'quic/crypto/aes_128_gcm_12_decrypter_openssl.cc', 1433 'quic/crypto/aes_128_gcm_12_decrypter_openssl.cc',
1439 'quic/crypto/aes_128_gcm_12_encrypter_openssl.cc', 1434 'quic/crypto/aes_128_gcm_12_encrypter_openssl.cc',
1440 'quic/crypto/chacha20_poly1305_decrypter_openssl.cc', 1435 'quic/crypto/chacha20_poly1305_decrypter_openssl.cc',
1441 'quic/crypto/chacha20_poly1305_encrypter_openssl.cc', 1436 'quic/crypto/chacha20_poly1305_encrypter_openssl.cc',
1442 'quic/crypto/channel_id_openssl.cc', 1437 'quic/crypto/channel_id_openssl.cc',
1443 'quic/crypto/p256_key_exchange_openssl.cc', 1438 'quic/crypto/p256_key_exchange_openssl.cc',
1444 'quic/crypto/scoped_evp_aead_ctx.cc', 1439 'quic/crypto/scoped_evp_aead_ctx.cc',
1445 'quic/crypto/scoped_evp_aead_ctx.h', 1440 'quic/crypto/scoped_evp_aead_ctx.h',
1446 'socket/ssl_client_socket_openssl.cc', 1441 'socket/ssl_client_socket_openssl.cc',
1447 'socket/ssl_client_socket_openssl.h', 1442 'socket/ssl_client_socket_openssl.h',
1448 'socket/ssl_server_socket_openssl.cc', 1443 'socket/ssl_server_socket_openssl.cc',
1449 'socket/ssl_session_cache_openssl.cc', 1444 'socket/ssl_session_cache_openssl.cc',
1450 'socket/ssl_session_cache_openssl.h', 1445 'socket/ssl_session_cache_openssl.h',
1446 ],
1447 },
1448 ],
1449 [ 'use_openssl_certs == 0', {
1450 'sources!': [
1451 'base/openssl_private_key_store.h',
1452 'base/openssl_private_key_store_android.cc',
1453 'base/openssl_private_key_store_memory.cc',
1454 'cert/cert_database_openssl.cc',
1455 'cert/cert_verify_proc_openssl.cc',
1456 'cert/cert_verify_proc_openssl.h',
1457 'cert/test_root_certs_openssl.cc',
1458 'cert/x509_certificate_openssl.cc',
1451 'ssl/openssl_client_key_store.cc', 1459 'ssl/openssl_client_key_store.cc',
1452 'ssl/openssl_client_key_store.h', 1460 'ssl/openssl_client_key_store.h',
1453 ], 1461 ],
1454 }, 1462 }],
1455 ],
1456 [ 'use_glib == 1', { 1463 [ 'use_glib == 1', {
1457 'dependencies': [ 1464 'dependencies': [
1458 '../build/linux/system.gyp:gconf', 1465 '../build/linux/system.gyp:gconf',
1459 '../build/linux/system.gyp:gio', 1466 '../build/linux/system.gyp:gio',
1460 ], 1467 ],
1461 }], 1468 }],
1462 [ 'desktop_linux == 1 or chromeos == 1', { 1469 [ 'desktop_linux == 1 or chromeos == 1', {
1463 'conditions': [ 1470 'conditions': [
1464 ['use_openssl==1', { 1471 ['use_openssl == 0', {
1465 'dependencies': [ 1472 # use NSS
1466 '../third_party/openssl/openssl.gyp:openssl',
1467 ],
1468 },
1469 { # else use_openssl==0, use NSS
1470 'dependencies': [ 1473 'dependencies': [
1471 '../build/linux/system.gyp:ssl', 1474 '../build/linux/system.gyp:ssl',
1472 ], 1475 ],
1473 }], 1476 }],
1474 ['os_bsd==1', { 1477 ['os_bsd==1', {
1475 'sources!': [ 1478 'sources!': [
1476 'base/network_change_notifier_linux.cc', 1479 'base/network_change_notifier_linux.cc',
1477 'base/network_change_notifier_netlink_linux.cc', 1480 'base/network_change_notifier_netlink_linux.cc',
1478 'proxy/proxy_config_service_linux.cc', 1481 'proxy/proxy_config_service_linux.cc',
1479 ], 1482 ],
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
1568 'base/winsock_init.cc', 1571 'base/winsock_init.cc',
1569 'base/winsock_init.h', 1572 'base/winsock_init.h',
1570 'base/winsock_util.cc', 1573 'base/winsock_util.cc',
1571 'base/winsock_util.h', 1574 'base/winsock_util.h',
1572 'proxy/proxy_resolver_winhttp.cc', 1575 'proxy/proxy_resolver_winhttp.cc',
1573 'proxy/proxy_resolver_winhttp.h', 1576 'proxy/proxy_resolver_winhttp.h',
1574 ], 1577 ],
1575 }, 1578 },
1576 ], 1579 ],
1577 [ 'OS == "mac"', { 1580 [ 'OS == "mac"', {
1578 'dependencies': [ 1581 'conditions': [
1579 '../third_party/nss/nss.gyp:nspr', 1582 [ 'use_openssl == 0', {
1580 '../third_party/nss/nss.gyp:nss', 1583 'dependencies': [
1581 'third_party/nss/ssl.gyp:libssl', 1584 # defaults to nss
1585 '../third_party/nss/nss.gyp:nspr',
1586 '../third_party/nss/nss.gyp:nss',
1587 'third_party/nss/ssl.gyp:libssl',
1588 ],
1589 }],
1582 ], 1590 ],
1583 'link_settings': { 1591 'link_settings': {
1584 'libraries': [ 1592 'libraries': [
1585 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 1593 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
1586 '$(SDKROOT)/System/Library/Frameworks/Security.framework', 1594 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
1587 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew ork', 1595 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew ork',
1588 '$(SDKROOT)/usr/lib/libresolv.dylib', 1596 '$(SDKROOT)/usr/lib/libresolv.dylib',
1589 ] 1597 ]
1590 }, 1598 },
1591 }, 1599 },
(...skipping 669 matching lines...) Expand 10 before | Expand all | Expand 10 after
2261 'cert/nss_cert_database_unittest.cc', 2269 'cert/nss_cert_database_unittest.cc',
2262 'cert/x509_util_nss_unittest.cc', 2270 'cert/x509_util_nss_unittest.cc',
2263 'quic/test_tools/crypto_test_utils_nss.cc', 2271 'quic/test_tools/crypto_test_utils_nss.cc',
2264 ], 2272 ],
2265 }, { # else !use_openssl: remove the unneeded files 2273 }, { # else !use_openssl: remove the unneeded files
2266 'sources!': [ 2274 'sources!': [
2267 'cert/x509_util_openssl_unittest.cc', 2275 'cert/x509_util_openssl_unittest.cc',
2268 'quic/test_tools/crypto_test_utils_openssl.cc', 2276 'quic/test_tools/crypto_test_utils_openssl.cc',
2269 'socket/ssl_client_socket_openssl_unittest.cc', 2277 'socket/ssl_client_socket_openssl_unittest.cc',
2270 'socket/ssl_session_cache_openssl_unittest.cc', 2278 'socket/ssl_session_cache_openssl_unittest.cc',
2271 'ssl/openssl_client_key_store_unittest.cc',
2272 ], 2279 ],
2273 }, 2280 },
2274 ], 2281 ],
2282 [ 'use_openssl_certs == 0', {
2283 'sources!': [
2284 'ssl/openssl_client_key_store_unittest.cc',
2285 ],
2286 }],
2275 [ 'enable_websockets != 1', { 2287 [ 'enable_websockets != 1', {
2276 'sources/': [ 2288 'sources/': [
2277 ['exclude', '^socket_stream/'], 2289 ['exclude', '^socket_stream/'],
2278 ['exclude', '^websockets/'], 2290 ['exclude', '^websockets/'],
2279 ['exclude', '^spdy/spdy_websocket_stream_unittest\\.cc$'], 2291 ['exclude', '^spdy/spdy_websocket_stream_unittest\\.cc$'],
2280 ], 2292 ],
2281 }], 2293 }],
2282 [ 'disable_ftp_support==1', { 2294 [ 'disable_ftp_support==1', {
2283 'sources/': [ 2295 'sources/': [
2284 ['exclude', '^ftp/'], 2296 ['exclude', '^ftp/'],
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
2332 # TODO(mark): Specifying this here shouldn't be necessary. 2344 # TODO(mark): Specifying this here shouldn't be necessary.
2333 'dependencies': [ 2345 'dependencies': [
2334 '../third_party/icu/icu.gyp:icudata', 2346 '../third_party/icu/icu.gyp:icudata',
2335 ], 2347 ],
2336 }], 2348 }],
2337 ], 2349 ],
2338 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 2350 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
2339 'msvs_disabled_warnings': [4267, ], 2351 'msvs_disabled_warnings': [4267, ],
2340 }, 2352 },
2341 ], 2353 ],
2342 [ 'OS == "mac"', { 2354 [ 'OS == "mac" and use_openssl == 0', {
2343 'dependencies': [ 2355 'dependencies': [
2344 '../third_party/nss/nss.gyp:nspr', 2356 '../third_party/nss/nss.gyp:nspr',
2345 '../third_party/nss/nss.gyp:nss', 2357 '../third_party/nss/nss.gyp:nss',
2346 'third_party/nss/ssl.gyp:libssl', 2358 'third_party/nss/ssl.gyp:libssl',
2347 ], 2359 ],
2348 }, 2360 },
2349 ], 2361 ],
2350 [ 'OS == "ios"', { 2362 [ 'OS == "ios"', {
2351 'dependencies': [ 2363 'dependencies': [
2352 '../third_party/nss/nss.gyp:nss', 2364 '../third_party/nss/nss.gyp:nss',
(...skipping 1061 matching lines...) Expand 10 before | Expand all | Expand 10 after
3414 'java_in_dir': 'cronet/android/sample/javatests', 3426 'java_in_dir': 'cronet/android/sample/javatests',
3415 'resource_dir': 'cronet/android/sample/res', 3427 'resource_dir': 'cronet/android/sample/res',
3416 'is_test_apk': 1, 3428 'is_test_apk': 1,
3417 }, 3429 },
3418 'includes': [ '../build/java_apk.gypi' ], 3430 'includes': [ '../build/java_apk.gypi' ],
3419 }, 3431 },
3420 ], 3432 ],
3421 }], # OS=="android" 3433 }], # OS=="android"
3422 ], 3434 ],
3423 } 3435 }
OLDNEW
« no previous file with comments | « net/cert/x509_certificate.h ('k') | net/socket/ssl_client_socket_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698