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

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: address other points of original review too 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 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 'sources!': [ 759 'sources!': [
757 'base/cert_database_nss.cc', 760 'base/cert_database_nss.cc',
758 'base/crypto_module_nss.cc', 761 'base/crypto_module_nss.cc',
759 'base/dnssec_keyset.cc', 762 'base/dnssec_keyset.cc',
760 'base/dnssec_keyset.h', 763 'base/dnssec_keyset.h',
761 'base/keygen_handler_nss.cc', 764 'base/keygen_handler_nss.cc',
762 'base/nss_memio.c', 765 'base/nss_memio.c',
763 'base/nss_memio.h', 766 'base/nss_memio.h',
764 'base/test_root_certs_nss.cc', 767 'base/test_root_certs_nss.cc',
765 'base/x509_certificate_nss.cc', 768 'base/x509_certificate_nss.cc',
769 'base/x509_util_nss.cc',
770 'base/x509_util_nss.h',
766 'ocsp/nss_ocsp.cc', 771 'ocsp/nss_ocsp.cc',
767 'ocsp/nss_ocsp.h', 772 'ocsp/nss_ocsp.h',
768 'socket/dns_cert_provenance_check.cc', 773 'socket/dns_cert_provenance_check.cc',
769 'socket/dns_cert_provenance_check.h', 774 'socket/dns_cert_provenance_check.h',
770 'socket/nss_ssl_util.cc', 775 'socket/nss_ssl_util.cc',
771 'socket/nss_ssl_util.h', 776 'socket/nss_ssl_util.h',
772 'socket/ssl_client_socket_nss.cc', 777 'socket/ssl_client_socket_nss.cc',
773 'socket/ssl_client_socket_nss.h', 778 'socket/ssl_client_socket_nss.h',
774 'socket/ssl_server_socket_nss.cc', 779 'socket/ssl_server_socket_nss.cc',
775 'socket/ssl_server_socket_nss.h', 780 'socket/ssl_server_socket_nss.h',
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
967 'base/ssl_client_auth_cache_unittest.cc', 972 'base/ssl_client_auth_cache_unittest.cc',
968 'base/ssl_config_service_unittest.cc', 973 'base/ssl_config_service_unittest.cc',
969 'base/ssl_false_start_blacklist_unittest.cc', 974 'base/ssl_false_start_blacklist_unittest.cc',
970 'base/static_cookie_policy_unittest.cc', 975 'base/static_cookie_policy_unittest.cc',
971 'base/transport_security_state_unittest.cc', 976 'base/transport_security_state_unittest.cc',
972 'base/test_certificate_data.h', 977 'base/test_certificate_data.h',
973 'base/test_completion_callback_unittest.cc', 978 'base/test_completion_callback_unittest.cc',
974 'base/upload_data_stream_unittest.cc', 979 'base/upload_data_stream_unittest.cc',
975 'base/x509_certificate_unittest.cc', 980 'base/x509_certificate_unittest.cc',
976 'base/x509_cert_types_mac_unittest.cc', 981 'base/x509_cert_types_mac_unittest.cc',
982 'base/x509_util_nss_unittest.cc',
983 'base/x509_util_openssl_unittest.cc',
977 'disk_cache/addr_unittest.cc', 984 'disk_cache/addr_unittest.cc',
978 'disk_cache/backend_unittest.cc', 985 'disk_cache/backend_unittest.cc',
979 'disk_cache/bitmap_unittest.cc', 986 'disk_cache/bitmap_unittest.cc',
980 'disk_cache/block_files_unittest.cc', 987 'disk_cache/block_files_unittest.cc',
981 'disk_cache/cache_util_unittest.cc', 988 'disk_cache/cache_util_unittest.cc',
982 'disk_cache/disk_cache_test_base.cc', 989 'disk_cache/disk_cache_test_base.cc',
983 'disk_cache/disk_cache_test_base.h', 990 'disk_cache/disk_cache_test_base.h',
984 'disk_cache/entry_unittest.cc', 991 'disk_cache/entry_unittest.cc',
985 'disk_cache/mapped_file_unittest.cc', 992 'disk_cache/mapped_file_unittest.cc',
986 'disk_cache/storage_block_unittest.cc', 993 'disk_cache/storage_block_unittest.cc',
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
1148 'http/http_auth_handler_negotiate_unittest.cc', 1155 'http/http_auth_handler_negotiate_unittest.cc',
1149 'http/mock_gssapi_library_posix.cc', 1156 'http/mock_gssapi_library_posix.cc',
1150 'http/mock_gssapi_library_posix.h', 1157 'http/mock_gssapi_library_posix.h',
1151 ], 1158 ],
1152 }], 1159 }],
1153 [ 'use_openssl==1', { 1160 [ 'use_openssl==1', {
1154 # When building for OpenSSL, we need to exclude NSS specific tests. 1161 # When building for OpenSSL, we need to exclude NSS specific tests.
1155 # TODO(bulach): Add equivalent tests when the underlying 1162 # TODO(bulach): Add equivalent tests when the underlying
1156 # functionality is ported to OpenSSL. 1163 # functionality is ported to OpenSSL.
1157 'sources!': [ 1164 'sources!': [
1165 'base/x509_util_nss_unittest.cc',
1158 'base/cert_database_nss_unittest.cc', 1166 'base/cert_database_nss_unittest.cc',
1159 'base/dnssec_unittest.cc', 1167 'base/dnssec_unittest.cc',
1160 ], 1168 ],
1161 }, 1169 },
1170 { # else !use_openssl: remove the unneeded files
wtc 2011/10/17 19:09:27 Put this on the previous line. See line 1152 abov
mattm 2011/10/17 22:54:19 Done.
1171 'sources!': [
1172 'base/x509_util_openssl_unittest.cc',
1173 ],
1174 },
1162 ], 1175 ],
1163 [ 'OS == "win"', { 1176 [ 'OS == "win"', {
1164 'sources!': [ 1177 'sources!': [
1165 'dns/dns_config_service_posix_unittest.cc', 1178 'dns/dns_config_service_posix_unittest.cc',
1166 'http/http_auth_gssapi_posix_unittest.cc', 1179 'http/http_auth_gssapi_posix_unittest.cc',
1167 ], 1180 ],
1168 # This is needed to trigger the dll copy step on windows. 1181 # This is needed to trigger the dll copy step on windows.
1169 # TODO(mark): Specifying this here shouldn't be necessary. 1182 # TODO(mark): Specifying this here shouldn't be necessary.
1170 'dependencies': [ 1183 'dependencies': [
1171 '../third_party/icu/icu.gyp:icudata', 1184 '../third_party/icu/icu.gyp:icudata',
1185 '../third_party/nss/nss.gyp:nspr',
1186 '../third_party/nss/nss.gyp:nss',
1187 'third_party/nss/ssl.gyp:ssl',
1172 ], 1188 ],
1173 }, 1189 },
1174 ], 1190 ],
1191 [ 'OS == "mac"', {
1192 'dependencies': [
1193 '../third_party/nss/nss.gyp:nspr',
1194 '../third_party/nss/nss.gyp:nss',
1195 'third_party/nss/ssl.gyp:ssl',
1196 ],
1197 },
1198 ],
1175 ], 1199 ],
1176 }, 1200 },
1177 { 1201 {
1178 'target_name': 'net_perftests', 1202 'target_name': 'net_perftests',
1179 'type': 'executable', 1203 'type': 'executable',
1180 'dependencies': [ 1204 'dependencies': [
1181 'net', 1205 'net',
1182 'net_test_support', 1206 'net_test_support',
1183 '../base/base.gyp:base', 1207 '../base/base.gyp:base',
1184 '../base/base.gyp:base_i18n', 1208 '../base/base.gyp:base_i18n',
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
1576 'tools/dump_cache/url_to_filename_encoder.cc', 1600 'tools/dump_cache/url_to_filename_encoder.cc',
1577 'tools/dump_cache/url_to_filename_encoder.h', 1601 'tools/dump_cache/url_to_filename_encoder.h',
1578 'tools/dump_cache/url_utilities.h', 1602 'tools/dump_cache/url_utilities.h',
1579 'tools/dump_cache/url_utilities.cc', 1603 'tools/dump_cache/url_utilities.cc',
1580 ], 1604 ],
1581 }, 1605 },
1582 ], 1606 ],
1583 }], 1607 }],
1584 ], 1608 ],
1585 } 1609 }
OLDNEW
« net/base/x509_util_openssl.cc ('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