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

Side by Side Diff: net/net.gyp

Issue 89623002: net: Implement new SSL session cache for OpenSSL sockets. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update comments Created 7 years 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 | Annotate | Revision Log
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 929 matching lines...) Expand 10 before | Expand all | Expand 10 after
940 'socket/ssl_client_socket_openssl.cc', 940 'socket/ssl_client_socket_openssl.cc',
941 'socket/ssl_client_socket_openssl.h', 941 'socket/ssl_client_socket_openssl.h',
942 'socket/ssl_client_socket_pool.cc', 942 'socket/ssl_client_socket_pool.cc',
943 'socket/ssl_client_socket_pool.h', 943 'socket/ssl_client_socket_pool.h',
944 'socket/ssl_error_params.cc', 944 'socket/ssl_error_params.cc',
945 'socket/ssl_error_params.h', 945 'socket/ssl_error_params.h',
946 'socket/ssl_server_socket.h', 946 'socket/ssl_server_socket.h',
947 'socket/ssl_server_socket_nss.cc', 947 'socket/ssl_server_socket_nss.cc',
948 'socket/ssl_server_socket_nss.h', 948 'socket/ssl_server_socket_nss.h',
949 'socket/ssl_server_socket_openssl.cc', 949 'socket/ssl_server_socket_openssl.cc',
950 'socket/ssl_session_cache_openssl.cc',
951 'socket/ssl_session_cache_openssl.h',
950 'socket/ssl_socket.h', 952 'socket/ssl_socket.h',
951 'socket/stream_listen_socket.cc', 953 'socket/stream_listen_socket.cc',
952 'socket/stream_listen_socket.h', 954 'socket/stream_listen_socket.h',
953 'socket/stream_socket.cc', 955 'socket/stream_socket.cc',
954 'socket/stream_socket.h', 956 'socket/stream_socket.h',
955 'socket/tcp_client_socket.cc', 957 'socket/tcp_client_socket.cc',
956 'socket/tcp_client_socket.h', 958 'socket/tcp_client_socket.h',
957 'socket/tcp_listen_socket.cc', 959 'socket/tcp_listen_socket.cc',
958 'socket/tcp_listen_socket.h', 960 'socket/tcp_listen_socket.h',
959 'socket/tcp_server_socket.cc', 961 'socket/tcp_server_socket.cc',
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
1325 'cert/x509_util_openssl.h', 1327 'cert/x509_util_openssl.h',
1326 'quic/crypto/aes_128_gcm_12_decrypter_openssl.cc', 1328 'quic/crypto/aes_128_gcm_12_decrypter_openssl.cc',
1327 'quic/crypto/aes_128_gcm_12_encrypter_openssl.cc', 1329 'quic/crypto/aes_128_gcm_12_encrypter_openssl.cc',
1328 'quic/crypto/channel_id_openssl.cc', 1330 'quic/crypto/channel_id_openssl.cc',
1329 'quic/crypto/p256_key_exchange_openssl.cc', 1331 'quic/crypto/p256_key_exchange_openssl.cc',
1330 'quic/crypto/scoped_evp_cipher_ctx.cc', 1332 'quic/crypto/scoped_evp_cipher_ctx.cc',
1331 'quic/crypto/scoped_evp_cipher_ctx.h', 1333 'quic/crypto/scoped_evp_cipher_ctx.h',
1332 'socket/ssl_client_socket_openssl.cc', 1334 'socket/ssl_client_socket_openssl.cc',
1333 'socket/ssl_client_socket_openssl.h', 1335 'socket/ssl_client_socket_openssl.h',
1334 'socket/ssl_server_socket_openssl.cc', 1336 'socket/ssl_server_socket_openssl.cc',
1337 'socket/ssl_session_cache_openssl.cc',
1338 'socket/ssl_session_cache_openssl.h',
1335 'ssl/openssl_client_key_store.cc', 1339 'ssl/openssl_client_key_store.cc',
1336 'ssl/openssl_client_key_store.h', 1340 'ssl/openssl_client_key_store.h',
1337 ], 1341 ],
1338 }, 1342 },
1339 ], 1343 ],
1340 [ 'use_glib == 1', { 1344 [ 'use_glib == 1', {
1341 'dependencies': [ 1345 'dependencies': [
1342 '../build/linux/system.gyp:gconf', 1346 '../build/linux/system.gyp:gconf',
1343 '../build/linux/system.gyp:gio', 1347 '../build/linux/system.gyp:gio',
1344 ], 1348 ],
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
1865 'socket/deterministic_socket_data_unittest.cc', 1869 'socket/deterministic_socket_data_unittest.cc',
1866 'socket/mock_client_socket_pool_manager.cc', 1870 'socket/mock_client_socket_pool_manager.cc',
1867 'socket/mock_client_socket_pool_manager.h', 1871 'socket/mock_client_socket_pool_manager.h',
1868 'socket/socks5_client_socket_unittest.cc', 1872 'socket/socks5_client_socket_unittest.cc',
1869 'socket/socks_client_socket_pool_unittest.cc', 1873 'socket/socks_client_socket_pool_unittest.cc',
1870 'socket/socks_client_socket_unittest.cc', 1874 'socket/socks_client_socket_unittest.cc',
1871 'socket/ssl_client_socket_openssl_unittest.cc', 1875 'socket/ssl_client_socket_openssl_unittest.cc',
1872 'socket/ssl_client_socket_pool_unittest.cc', 1876 'socket/ssl_client_socket_pool_unittest.cc',
1873 'socket/ssl_client_socket_unittest.cc', 1877 'socket/ssl_client_socket_unittest.cc',
1874 'socket/ssl_server_socket_unittest.cc', 1878 'socket/ssl_server_socket_unittest.cc',
1879 'socket/ssl_session_cache_openssl_unittest.cc',
1875 'socket/tcp_client_socket_unittest.cc', 1880 'socket/tcp_client_socket_unittest.cc',
1876 'socket/tcp_listen_socket_unittest.cc', 1881 'socket/tcp_listen_socket_unittest.cc',
1877 'socket/tcp_listen_socket_unittest.h', 1882 'socket/tcp_listen_socket_unittest.h',
1878 'socket/tcp_server_socket_unittest.cc', 1883 'socket/tcp_server_socket_unittest.cc',
1879 'socket/tcp_socket_unittest.cc', 1884 'socket/tcp_socket_unittest.cc',
1880 'socket/transport_client_socket_pool_unittest.cc', 1885 'socket/transport_client_socket_pool_unittest.cc',
1881 'socket/transport_client_socket_unittest.cc', 1886 'socket/transport_client_socket_unittest.cc',
1882 'socket/unix_domain_socket_posix_unittest.cc', 1887 'socket/unix_domain_socket_posix_unittest.cc',
1883 'socket_stream/socket_stream_metrics_unittest.cc', 1888 'socket_stream/socket_stream_metrics_unittest.cc',
1884 'socket_stream/socket_stream_unittest.cc', 1889 'socket_stream/socket_stream_unittest.cc',
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
2022 # No res_ninit() et al on Android, so this doesn't make a lot of 2027 # No res_ninit() et al on Android, so this doesn't make a lot of
2023 # sense. 2028 # sense.
2024 'dns/dns_config_service_posix_unittest.cc', 2029 'dns/dns_config_service_posix_unittest.cc',
2025 'ssl/client_cert_store_impl_unittest.cc', 2030 'ssl/client_cert_store_impl_unittest.cc',
2026 ], 2031 ],
2027 'dependencies': [ 2032 'dependencies': [
2028 'net_javatests', 2033 'net_javatests',
2029 'net_test_jni_headers', 2034 'net_test_jni_headers',
2030 ], 2035 ],
2031 }], 2036 }],
2032 [ 'desktop_linux == 1 or chromeos == 1', { 2037 [ 'use_openssl == 1', {
2033 'dependencies': [ 2038 # Avoid compiling/linking with the system library.
2034 '../build/linux/system.gyp:ssl', 2039 'dependencies': [
2035 ], 2040 '../third_party/openssl/openssl.gyp:openssl',
2036 }, { # desktop_linux == 0 and chromeos == 0 2041 ],
2037 'sources!': [ 2042 }, { # use_openssl == 0
2038 'cert/nss_cert_database_unittest.cc', 2043 'conditions': [
2039 ], 2044 [ 'desktop_linux == 1 or chromeos == 1', {
2040 }, 2045 'dependencies': [
2041 ], 2046 '../build/linux/system.gyp:ssl',
2047 ],
2048 }, { # desktop_linux == 0 and chromeos == 0
2049 'sources!': [
2050 'cert/nss_cert_database_unittest.cc',
2051 ],
2052 }],
2053 ],
2054 }],
2042 [ 'toolkit_uses_gtk == 1', { 2055 [ 'toolkit_uses_gtk == 1', {
2043 'dependencies': [ 2056 'dependencies': [
2044 '../build/linux/system.gyp:gtk', 2057 '../build/linux/system.gyp:gtk',
2045 ], 2058 ],
2046 }, 2059 },
2047 ], 2060 ],
2048 [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { 2061 [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
2049 'conditions': [ 2062 'conditions': [
2050 ['linux_use_tcmalloc==1', { 2063 ['linux_use_tcmalloc==1', {
2051 'dependencies': [ 2064 'dependencies': [
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
2084 'cert/nss_cert_database_unittest.cc', 2097 'cert/nss_cert_database_unittest.cc',
2085 'cert/x509_util_nss_unittest.cc', 2098 'cert/x509_util_nss_unittest.cc',
2086 'quic/test_tools/crypto_test_utils_nss.cc', 2099 'quic/test_tools/crypto_test_utils_nss.cc',
2087 'ssl/client_cert_store_impl_unittest.cc', 2100 'ssl/client_cert_store_impl_unittest.cc',
2088 ], 2101 ],
2089 }, { # else !use_openssl: remove the unneeded files 2102 }, { # else !use_openssl: remove the unneeded files
2090 'sources!': [ 2103 'sources!': [
2091 'cert/x509_util_openssl_unittest.cc', 2104 'cert/x509_util_openssl_unittest.cc',
2092 'quic/test_tools/crypto_test_utils_openssl.cc', 2105 'quic/test_tools/crypto_test_utils_openssl.cc',
2093 'socket/ssl_client_socket_openssl_unittest.cc', 2106 'socket/ssl_client_socket_openssl_unittest.cc',
2107 'socket/ssl_session_cache_openssl_unittest.cc',
2094 'ssl/openssl_client_key_store_unittest.cc', 2108 'ssl/openssl_client_key_store_unittest.cc',
2095 ], 2109 ],
2096 }, 2110 },
2097 ], 2111 ],
2098 [ 'enable_websockets != 1', { 2112 [ 'enable_websockets != 1', {
2099 'sources/': [ 2113 'sources/': [
2100 ['exclude', '^socket_stream/'], 2114 ['exclude', '^socket_stream/'],
2101 ['exclude', '^websockets/'], 2115 ['exclude', '^websockets/'],
2102 ['exclude', '^spdy/spdy_websocket_stream_unittest\\.cc$'], 2116 ['exclude', '^spdy/spdy_websocket_stream_unittest\\.cc$'],
2103 ], 2117 ],
(...skipping 953 matching lines...) Expand 10 before | Expand all | Expand 10 after
3057 'net_unittests.isolate', 3071 'net_unittests.isolate',
3058 ], 3072 ],
3059 'sources': [ 3073 'sources': [
3060 'net_unittests.isolate', 3074 'net_unittests.isolate',
3061 ], 3075 ],
3062 }, 3076 },
3063 ], 3077 ],
3064 }], 3078 }],
3065 ], 3079 ],
3066 } 3080 }
OLDNEW
« no previous file with comments | « no previous file | net/socket/ssl_client_socket_openssl.cc » ('j') | net/socket/ssl_session_cache_openssl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698