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

Side by Side Diff: net/net.gyp

Issue 12220104: Wire up SSL client authentication for OpenSSL/Android through the net/ stack (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: git cl try Created 7 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
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_simple_cache_backend%': 0, 10 'use_simple_cache_backend%': 0,
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 'base/network_change_notifier_win.cc', 234 'base/network_change_notifier_win.cc',
235 'base/network_change_notifier_win.h', 235 'base/network_change_notifier_win.h',
236 'base/network_config_watcher_mac.cc', 236 'base/network_config_watcher_mac.cc',
237 'base/network_config_watcher_mac.h', 237 'base/network_config_watcher_mac.h',
238 'base/network_delegate.cc', 238 'base/network_delegate.cc',
239 'base/network_delegate.h', 239 'base/network_delegate.h',
240 'base/nss_cert_database.cc', 240 'base/nss_cert_database.cc',
241 'base/nss_cert_database.h', 241 'base/nss_cert_database.h',
242 'base/nss_memio.c', 242 'base/nss_memio.c',
243 'base/nss_memio.h', 243 'base/nss_memio.h',
244 'base/openssl_memory_private_key_store.cc', 244 'base/openssl_client_key_store.cc',
245 'base/openssl_client_key_store.h',
245 'base/openssl_private_key_store.h', 246 'base/openssl_private_key_store.h',
246 'base/openssl_private_key_store_android.cc', 247 'base/openssl_private_key_store_android.cc',
248 'base/openssl_private_key_store_memory.cc',
247 'base/pem_tokenizer.cc', 249 'base/pem_tokenizer.cc',
248 'base/pem_tokenizer.h', 250 'base/pem_tokenizer.h',
249 'base/platform_mime_util.h', 251 'base/platform_mime_util.h',
250 # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types? 252 # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types?
251 'base/platform_mime_util_linux.cc', 253 'base/platform_mime_util_linux.cc',
252 'base/platform_mime_util_mac.mm', 254 'base/platform_mime_util_mac.mm',
253 'base/platform_mime_util_win.cc', 255 'base/platform_mime_util_win.cc',
254 'base/prioritized_dispatcher.cc', 256 'base/prioritized_dispatcher.cc',
255 'base/prioritized_dispatcher.h', 257 'base/prioritized_dispatcher.h',
256 'base/priority_queue.h', 258 'base/priority_queue.h',
(...skipping 836 matching lines...) Expand 10 before | Expand all | Expand 10 after
1093 'third_party/mozilla_security_manager/nsPKCS12Blob.h', 1095 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
1094 ], 1096 ],
1095 }, 1097 },
1096 { # else !use_openssl: remove the unneeded files 1098 { # else !use_openssl: remove the unneeded files
1097 'sources!': [ 1099 'sources!': [
1098 'base/cert_database_openssl.cc', 1100 'base/cert_database_openssl.cc',
1099 'base/cert_verify_proc_openssl.cc', 1101 'base/cert_verify_proc_openssl.cc',
1100 'base/cert_verify_proc_openssl.h', 1102 'base/cert_verify_proc_openssl.h',
1101 'base/crypto_module_openssl.cc', 1103 'base/crypto_module_openssl.cc',
1102 'base/keygen_handler_openssl.cc', 1104 'base/keygen_handler_openssl.cc',
1103 'base/openssl_memory_private_key_store.cc', 1105 'base/openssl_client_key_store.cc',
1106 'base/openssl_client_key_store.h',
1104 'base/openssl_private_key_store.h', 1107 'base/openssl_private_key_store.h',
1105 'base/openssl_private_key_store_android.cc', 1108 'base/openssl_private_key_store_android.cc',
1109 'base/openssl_private_key_store_memory.cc',
1106 'base/test_root_certs_openssl.cc', 1110 'base/test_root_certs_openssl.cc',
1107 'base/x509_certificate_openssl.cc', 1111 'base/x509_certificate_openssl.cc',
1108 'base/x509_util_openssl.cc', 1112 'base/x509_util_openssl.cc',
1109 'base/x509_util_openssl.h', 1113 'base/x509_util_openssl.h',
1110 'socket/ssl_client_socket_openssl.cc', 1114 'socket/ssl_client_socket_openssl.cc',
1111 'socket/ssl_client_socket_openssl.h', 1115 'socket/ssl_client_socket_openssl.h',
1112 'socket/ssl_server_socket_openssl.cc', 1116 'socket/ssl_server_socket_openssl.cc',
1113 ], 1117 ],
1114 }, 1118 },
1115 ], 1119 ],
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
1262 ], 1266 ],
1263 }], 1267 }],
1264 [ 'OS == "android"', { 1268 [ 'OS == "android"', {
1265 'dependencies': [ 1269 'dependencies': [
1266 '../third_party/openssl/openssl.gyp:openssl', 1270 '../third_party/openssl/openssl.gyp:openssl',
1267 'net_jni_headers', 1271 'net_jni_headers',
1268 ], 1272 ],
1269 'sources!': [ 1273 'sources!': [
1270 'base/cert_database_openssl.cc', 1274 'base/cert_database_openssl.cc',
1271 'base/cert_verify_proc_openssl.cc', 1275 'base/cert_verify_proc_openssl.cc',
1272 'base/openssl_memory_private_key_store.cc', 1276 'base/openssl_private_key_store_memory.cc',
1273 'base/test_root_certs_openssl.cc', 1277 'base/test_root_certs_openssl.cc',
1274 ], 1278 ],
1275 # The net/android/keystore_openssl.cc source file needs to 1279 # The net/android/keystore_openssl.cc source file needs to
1276 # access an OpenSSL-internal header. 1280 # access an OpenSSL-internal header.
1277 'include_dirs': [ 1281 'include_dirs': [
1278 '../third_party/openssl', 1282 '../third_party/openssl',
1279 ], 1283 ],
1280 }, { # else OS != "android" 1284 }, { # else OS != "android"
1281 'defines': [ 1285 'defines': [
1282 # These are the features Android doesn't support. 1286 # These are the features Android doesn't support.
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
1369 'base/mapped_host_resolver_unittest.cc', 1373 'base/mapped_host_resolver_unittest.cc',
1370 'base/mime_sniffer_unittest.cc', 1374 'base/mime_sniffer_unittest.cc',
1371 'base/mime_util_unittest.cc', 1375 'base/mime_util_unittest.cc',
1372 'base/mock_filter_context.cc', 1376 'base/mock_filter_context.cc',
1373 'base/mock_filter_context.h', 1377 'base/mock_filter_context.h',
1374 'base/multi_threaded_cert_verifier_unittest.cc', 1378 'base/multi_threaded_cert_verifier_unittest.cc',
1375 'base/net_log_unittest.h', 1379 'base/net_log_unittest.h',
1376 'base/net_util_unittest.cc', 1380 'base/net_util_unittest.cc',
1377 'base/network_change_notifier_win_unittest.cc', 1381 'base/network_change_notifier_win_unittest.cc',
1378 'base/nss_cert_database_unittest.cc', 1382 'base/nss_cert_database_unittest.cc',
1383 'base/openssl_client_key_store_unittest.cc',
1379 'base/pem_tokenizer_unittest.cc', 1384 'base/pem_tokenizer_unittest.cc',
1380 'base/prioritized_dispatcher_unittest.cc', 1385 'base/prioritized_dispatcher_unittest.cc',
1381 'base/priority_queue_unittest.cc', 1386 'base/priority_queue_unittest.cc',
1382 'base/registry_controlled_domains/registry_controlled_domain_unittest.cc ', 1387 'base/registry_controlled_domains/registry_controlled_domain_unittest.cc ',
1383 'base/run_all_unittests.cc', 1388 'base/run_all_unittests.cc',
1384 'base/sdch_filter_unittest.cc', 1389 'base/sdch_filter_unittest.cc',
1385 'base/server_bound_cert_service_unittest.cc', 1390 'base/server_bound_cert_service_unittest.cc',
1386 'base/single_request_host_resolver_unittest.cc', 1391 'base/single_request_host_resolver_unittest.cc',
1387 'base/ssl_cipher_suite_names_unittest.cc', 1392 'base/ssl_cipher_suite_names_unittest.cc',
1388 'base/ssl_client_auth_cache_unittest.cc', 1393 'base/ssl_client_auth_cache_unittest.cc',
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
1561 'quic/quic_time_test.cc', 1566 'quic/quic_time_test.cc',
1562 'quic/reliable_quic_stream_test.cc', 1567 'quic/reliable_quic_stream_test.cc',
1563 'socket/buffered_write_stream_socket_unittest.cc', 1568 'socket/buffered_write_stream_socket_unittest.cc',
1564 'socket/client_socket_pool_base_unittest.cc', 1569 'socket/client_socket_pool_base_unittest.cc',
1565 'socket/deterministic_socket_data_unittest.cc', 1570 'socket/deterministic_socket_data_unittest.cc',
1566 'socket/mock_client_socket_pool_manager.cc', 1571 'socket/mock_client_socket_pool_manager.cc',
1567 'socket/mock_client_socket_pool_manager.h', 1572 'socket/mock_client_socket_pool_manager.h',
1568 'socket/socks5_client_socket_unittest.cc', 1573 'socket/socks5_client_socket_unittest.cc',
1569 'socket/socks_client_socket_pool_unittest.cc', 1574 'socket/socks_client_socket_pool_unittest.cc',
1570 'socket/socks_client_socket_unittest.cc', 1575 'socket/socks_client_socket_unittest.cc',
1576 'socket/ssl_client_socket_openssl_unittest.cc',
1571 'socket/ssl_client_socket_pool_unittest.cc', 1577 'socket/ssl_client_socket_pool_unittest.cc',
1572 'socket/ssl_client_socket_unittest.cc', 1578 'socket/ssl_client_socket_unittest.cc',
1573 'socket/ssl_server_socket_unittest.cc', 1579 'socket/ssl_server_socket_unittest.cc',
1574 'socket/tcp_client_socket_unittest.cc', 1580 'socket/tcp_client_socket_unittest.cc',
1575 'socket/tcp_server_socket_unittest.cc', 1581 'socket/tcp_server_socket_unittest.cc',
1576 'socket/transport_client_socket_pool_unittest.cc', 1582 'socket/transport_client_socket_pool_unittest.cc',
1577 'socket/transport_client_socket_unittest.cc', 1583 'socket/transport_client_socket_unittest.cc',
1578 'socket_stream/socket_stream_metrics_unittest.cc', 1584 'socket_stream/socket_stream_metrics_unittest.cc',
1579 'socket_stream/socket_stream_unittest.cc', 1585 'socket_stream/socket_stream_unittest.cc',
1580 'spdy/buffered_spdy_framer_spdy3_unittest.cc', 1586 'spdy/buffered_spdy_framer_spdy3_unittest.cc',
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
1706 # When building for OpenSSL, we need to exclude NSS specific tests. 1712 # When building for OpenSSL, we need to exclude NSS specific tests.
1707 # TODO(bulach): Add equivalent tests when the underlying 1713 # TODO(bulach): Add equivalent tests when the underlying
1708 # functionality is ported to OpenSSL. 1714 # functionality is ported to OpenSSL.
1709 'sources!': [ 1715 'sources!': [
1710 'base/client_cert_store_impl_unittest.cc', 1716 'base/client_cert_store_impl_unittest.cc',
1711 'base/nss_cert_database_unittest.cc', 1717 'base/nss_cert_database_unittest.cc',
1712 'base/x509_util_nss_unittest.cc', 1718 'base/x509_util_nss_unittest.cc',
1713 ], 1719 ],
1714 }, { # else !use_openssl: remove the unneeded files 1720 }, { # else !use_openssl: remove the unneeded files
1715 'sources!': [ 1721 'sources!': [
1722 'base/openssl_client_key_store_unittest.cc',
1716 'base/x509_util_openssl_unittest.cc', 1723 'base/x509_util_openssl_unittest.cc',
1724 'socket/ssl_client_socket_openssl_unittest.cc',
1717 ], 1725 ],
1718 }, 1726 },
1719 ], 1727 ],
1720 [ 'enable_websockets != 1', { 1728 [ 'enable_websockets != 1', {
1721 'sources/': [ 1729 'sources/': [
1722 ['exclude', '^socket_stream/'], 1730 ['exclude', '^socket_stream/'],
1723 ['exclude', '^websockets/'], 1731 ['exclude', '^websockets/'],
1724 ['exclude', '^spdy/spdy_websocket_stream_spdy._unittest\\.cc$'], 1732 ['exclude', '^spdy/spdy_websocket_stream_spdy._unittest\\.cc$'],
1725 ], 1733 ],
1726 }], 1734 }],
(...skipping 826 matching lines...) Expand 10 before | Expand all | Expand 10 after
2553 '--result', '<@(_outputs)', 2561 '--result', '<@(_outputs)',
2554 '--isolate', 'net_unittests.isolate', 2562 '--isolate', 'net_unittests.isolate',
2555 ], 2563 ],
2556 }, 2564 },
2557 ], 2565 ],
2558 }, 2566 },
2559 ], 2567 ],
2560 }], 2568 }],
2561 ], 2569 ],
2562 } 2570 }
OLDNEW
« no previous file with comments | « net/data/ssl/scripts/generate-client-certificates.sh ('k') | net/socket/ssl_client_socket_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698