From 5bafc4f669ffc8ae187501ad8fec7a36f37abba6 Mon Sep 17 00:00:00 2001 From: "agl@chromium.org" Date: Wed, 8 Sep 2010 14:07:38 +0000 Subject: net: add prober results to False Start blacklist. Since the blacklist has gotten rather larger, it's now precompiled into a hash table in the binary. See also: http://www.imperialviolet.org/2010/09/05/blacklisting.html (Originally landed in r58712. Reverted in r58726 because it broke the ARM builders. The processing binary was being built for the target, not the host.) TEST=net_unittests BUG=none http://codereview.chromium.org/3303008/show git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58824 0039d316-1c4b-4281-b951-d872f2087c98 --- net/net.gyp | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'net/net.gyp') diff --git a/net/net.gyp b/net/net.gyp index 1814d59..33e45ff 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -19,6 +19,7 @@ '../third_party/icu/icu.gyp:icuuc', '../third_party/zlib/zlib.gyp:zlib', 'net_resources', + 'ssl_false_start_blacklist_process#host', ], 'sources': [ 'base/address_family.h', @@ -165,6 +166,7 @@ 'base/ssl_config_service_mac.h', 'base/ssl_config_service_win.cc', 'base/ssl_config_service_win.h', + 'base/ssl_false_start_blacklist.cc', 'base/ssl_info.cc', 'base/ssl_info.h', 'base/static_cookie_policy.cc', @@ -199,6 +201,25 @@ 'export_dependent_settings': [ '../base/base.gyp:base', ], + 'actions': [ + { + 'action_name': 'ssl_false_start_blacklist', + 'inputs': [ + '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)ssl_false_start_blacklist_process<(EXECUTABLE_SUFFIX)', + 'base/ssl_false_start_blacklist.txt', + ], + 'outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/net/base/ssl_false_start_blacklist_data.cc', + ], + 'action': + ['<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)ssl_false_start_blacklist_process<(EXECUTABLE_SUFFIX)', + 'base/ssl_false_start_blacklist.txt', + '<(SHARED_INTERMEDIATE_DIR)/net/base/ssl_false_start_blacklist_data.cc', + ], + 'message': 'Generating SSL False Start blacklist', + 'process_outputs_as_sources': 1, + }, + ], 'conditions': [ [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 'dependencies': [ @@ -732,6 +753,7 @@ 'base/ssl_config_service_mac_unittest.cc', 'base/ssl_config_service_unittest.cc', 'base/ssl_config_service_win_unittest.cc', + 'base/ssl_false_start_blacklist_unittest.cc', 'base/static_cookie_policy_unittest.cc', 'base/transport_security_state_unittest.cc', 'base/test_certificate_data.h', @@ -1112,6 +1134,17 @@ 'tools/hresolv/hresolv.cc', ], }, + { + 'target_name': 'ssl_false_start_blacklist_process', + 'type': 'executable', + 'toolsets': ['host'], + 'include_dirs': [ + '..', + ], + 'sources': [ + 'base/ssl_false_start_blacklist_process.cc', + ], + }, ], 'conditions': [ # ['OS=="linux"', { -- cgit v1.1