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

Side by Side Diff: net/net.gyp

Issue 8296014: Use NSS to generate Origin-Bound Certs on Win and Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review changes Created 9 years, 2 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 | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 'base/winsock_util.h', 240 'base/winsock_util.h',
241 'base/x509_cert_types.cc', 241 'base/x509_cert_types.cc',
242 'base/x509_cert_types.h', 242 'base/x509_cert_types.h',
243 'base/x509_cert_types_mac.cc', 243 'base/x509_cert_types_mac.cc',
244 'base/x509_certificate.cc', 244 'base/x509_certificate.cc',
245 'base/x509_certificate.h', 245 'base/x509_certificate.h',
246 'base/x509_certificate_mac.cc', 246 'base/x509_certificate_mac.cc',
247 'base/x509_certificate_nss.cc', 247 'base/x509_certificate_nss.cc',
248 'base/x509_certificate_openssl.cc', 248 'base/x509_certificate_openssl.cc',
249 'base/x509_certificate_win.cc', 249 'base/x509_certificate_win.cc',
250 'base/x509_util.h',
251 'base/x509_util_nss.cc',
252 'base/x509_util_nss.h',
250 'base/x509_util_openssl.cc', 253 'base/x509_util_openssl.cc',
251 'base/x509_util_openssl.h', 254 'base/x509_util_openssl.h',
252 'disk_cache/addr.cc', 255 'disk_cache/addr.cc',
253 'disk_cache/addr.h', 256 'disk_cache/addr.h',
254 'disk_cache/backend_impl.cc', 257 'disk_cache/backend_impl.cc',
255 'disk_cache/backend_impl.h', 258 'disk_cache/backend_impl.h',
256 'disk_cache/bitmap.cc', 259 'disk_cache/bitmap.cc',
257 'disk_cache/bitmap.h', 260 'disk_cache/bitmap.h',
258 'disk_cache/block_files.cc', 261 'disk_cache/block_files.cc',
259 'disk_cache/block_files.h', 262 'disk_cache/block_files.h',
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
758 'sources!': [ 761 'sources!': [
759 'base/cert_database_nss.cc', 762 'base/cert_database_nss.cc',
760 'base/crypto_module_nss.cc', 763 'base/crypto_module_nss.cc',
761 'base/dnssec_keyset.cc', 764 'base/dnssec_keyset.cc',
762 'base/dnssec_keyset.h', 765 'base/dnssec_keyset.h',
763 'base/keygen_handler_nss.cc', 766 'base/keygen_handler_nss.cc',
764 'base/nss_memio.c', 767 'base/nss_memio.c',
765 'base/nss_memio.h', 768 'base/nss_memio.h',
766 'base/test_root_certs_nss.cc', 769 'base/test_root_certs_nss.cc',
767 'base/x509_certificate_nss.cc', 770 'base/x509_certificate_nss.cc',
771 'base/x509_util_nss.cc',
772 'base/x509_util_nss.h',
768 'ocsp/nss_ocsp.cc', 773 'ocsp/nss_ocsp.cc',
769 'ocsp/nss_ocsp.h', 774 'ocsp/nss_ocsp.h',
770 'socket/dns_cert_provenance_check.cc', 775 'socket/dns_cert_provenance_check.cc',
771 'socket/dns_cert_provenance_check.h', 776 'socket/dns_cert_provenance_check.h',
772 'socket/nss_ssl_util.cc', 777 'socket/nss_ssl_util.cc',
773 'socket/nss_ssl_util.h', 778 'socket/nss_ssl_util.h',
774 'socket/ssl_client_socket_nss.cc', 779 'socket/ssl_client_socket_nss.cc',
775 'socket/ssl_client_socket_nss.h', 780 'socket/ssl_client_socket_nss.h',
776 'socket/ssl_server_socket_nss.cc', 781 'socket/ssl_server_socket_nss.cc',
777 'socket/ssl_server_socket_nss.h', 782 'socket/ssl_server_socket_nss.h',
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
969 'base/ssl_client_auth_cache_unittest.cc', 974 'base/ssl_client_auth_cache_unittest.cc',
970 'base/ssl_config_service_unittest.cc', 975 'base/ssl_config_service_unittest.cc',
971 'base/ssl_false_start_blacklist_unittest.cc', 976 'base/ssl_false_start_blacklist_unittest.cc',
972 'base/static_cookie_policy_unittest.cc', 977 'base/static_cookie_policy_unittest.cc',
973 'base/transport_security_state_unittest.cc', 978 'base/transport_security_state_unittest.cc',
974 'base/test_certificate_data.h', 979 'base/test_certificate_data.h',
975 'base/test_completion_callback_unittest.cc', 980 'base/test_completion_callback_unittest.cc',
976 'base/upload_data_stream_unittest.cc', 981 'base/upload_data_stream_unittest.cc',
977 'base/x509_certificate_unittest.cc', 982 'base/x509_certificate_unittest.cc',
978 'base/x509_cert_types_mac_unittest.cc', 983 'base/x509_cert_types_mac_unittest.cc',
984 'base/x509_util_nss_unittest.cc',
985 'base/x509_util_openssl_unittest.cc',
979 'disk_cache/addr_unittest.cc', 986 'disk_cache/addr_unittest.cc',
980 'disk_cache/backend_unittest.cc', 987 'disk_cache/backend_unittest.cc',
981 'disk_cache/bitmap_unittest.cc', 988 'disk_cache/bitmap_unittest.cc',
982 'disk_cache/block_files_unittest.cc', 989 'disk_cache/block_files_unittest.cc',
983 'disk_cache/cache_util_unittest.cc', 990 'disk_cache/cache_util_unittest.cc',
984 'disk_cache/disk_cache_test_base.cc', 991 'disk_cache/disk_cache_test_base.cc',
985 'disk_cache/disk_cache_test_base.h', 992 'disk_cache/disk_cache_test_base.h',
986 'disk_cache/entry_unittest.cc', 993 'disk_cache/entry_unittest.cc',
987 'disk_cache/mapped_file_unittest.cc', 994 'disk_cache/mapped_file_unittest.cc',
988 'disk_cache/storage_block_unittest.cc', 995 'disk_cache/storage_block_unittest.cc',
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
1150 'http/http_auth_handler_negotiate_unittest.cc', 1157 'http/http_auth_handler_negotiate_unittest.cc',
1151 'http/mock_gssapi_library_posix.cc', 1158 'http/mock_gssapi_library_posix.cc',
1152 'http/mock_gssapi_library_posix.h', 1159 'http/mock_gssapi_library_posix.h',
1153 ], 1160 ],
1154 }], 1161 }],
1155 [ 'use_openssl==1', { 1162 [ 'use_openssl==1', {
1156 # When building for OpenSSL, we need to exclude NSS specific tests. 1163 # When building for OpenSSL, we need to exclude NSS specific tests.
1157 # TODO(bulach): Add equivalent tests when the underlying 1164 # TODO(bulach): Add equivalent tests when the underlying
1158 # functionality is ported to OpenSSL. 1165 # functionality is ported to OpenSSL.
1159 'sources!': [ 1166 'sources!': [
1167 'base/x509_util_nss_unittest.cc',
1160 'base/cert_database_nss_unittest.cc', 1168 'base/cert_database_nss_unittest.cc',
1161 'base/dnssec_unittest.cc', 1169 'base/dnssec_unittest.cc',
1162 ], 1170 ],
1171 }, { # else !use_openssl: remove the unneeded files
1172 'sources!': [
1173 'base/x509_util_openssl_unittest.cc',
1174 ],
1163 }, 1175 },
1164 ], 1176 ],
1165 [ 'OS == "win"', { 1177 [ 'OS == "win"', {
1166 'sources!': [ 1178 'sources!': [
1167 'dns/dns_config_service_posix_unittest.cc', 1179 'dns/dns_config_service_posix_unittest.cc',
1168 'http/http_auth_gssapi_posix_unittest.cc', 1180 'http/http_auth_gssapi_posix_unittest.cc',
1169 ], 1181 ],
1170 # This is needed to trigger the dll copy step on windows. 1182 # This is needed to trigger the dll copy step on windows.
1171 # TODO(mark): Specifying this here shouldn't be necessary. 1183 # TODO(mark): Specifying this here shouldn't be necessary.
1172 'dependencies': [ 1184 'dependencies': [
1173 '../third_party/icu/icu.gyp:icudata', 1185 '../third_party/icu/icu.gyp:icudata',
1186 '../third_party/nss/nss.gyp:nspr',
1187 '../third_party/nss/nss.gyp:nss',
1188 'third_party/nss/ssl.gyp:ssl',
1174 ], 1189 ],
1175 }, 1190 },
1176 ], 1191 ],
1192 [ 'OS == "mac"', {
1193 'dependencies': [
1194 '../third_party/nss/nss.gyp:nspr',
1195 '../third_party/nss/nss.gyp:nss',
1196 'third_party/nss/ssl.gyp:ssl',
1197 ],
1198 },
1199 ],
1177 ], 1200 ],
1178 }, 1201 },
1179 { 1202 {
1180 'target_name': 'net_perftests', 1203 'target_name': 'net_perftests',
1181 'type': 'executable', 1204 'type': 'executable',
1182 'dependencies': [ 1205 'dependencies': [
1183 'net', 1206 'net',
1184 'net_test_support', 1207 'net_test_support',
1185 '../base/base.gyp:base', 1208 '../base/base.gyp:base',
1186 '../base/base.gyp:base_i18n', 1209 '../base/base.gyp:base_i18n',
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
1578 'tools/dump_cache/url_to_filename_encoder.cc', 1601 'tools/dump_cache/url_to_filename_encoder.cc',
1579 'tools/dump_cache/url_to_filename_encoder.h', 1602 'tools/dump_cache/url_to_filename_encoder.h',
1580 'tools/dump_cache/url_utilities.h', 1603 'tools/dump_cache/url_utilities.h',
1581 'tools/dump_cache/url_utilities.cc', 1604 'tools/dump_cache/url_utilities.cc',
1582 ], 1605 ],
1583 }, 1606 },
1584 ], 1607 ],
1585 }], 1608 }],
1586 ], 1609 ],
1587 } 1610 }
OLDNEW
« net/base/net_error_list.h ('K') | « net/base/x509_util_openssl_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698