diff options
Diffstat (limited to 'chromium/net/tools')
105 files changed, 261 insertions, 198 deletions
diff --git a/chromium/net/tools/build_hpack_constants.py b/chromium/net/tools/build_hpack_constants.py index 31110781181..ab3ac8edd64 100755 --- a/chromium/net/tools/build_hpack_constants.py +++ b/chromium/net/tools/build_hpack_constants.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright 2014 The Chromium Authors. All rights reserved. +# Copyright 2014 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/net/tools/cache_transparency/checksum_pervasive_js.py b/chromium/net/tools/cache_transparency/checksum_pervasive_js.py new file mode 100644 index 00000000000..9482bf5d665 --- /dev/null +++ b/chromium/net/tools/cache_transparency/checksum_pervasive_js.py @@ -0,0 +1,40 @@ +# Copyright 2022 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +"""Calculates the checksum for pervasive.js. + +Usage: + python3 checksum_pervasive_js.py pervasive.js + +""" + +import re +import sys +import pervasive_checksum + + +def main(argv): + if len(argv) != 2: + print('Supply the path to pervasive.js as the sole command-line argument') + sys.exit(1) + + filename = argv[1] + with open(filename, mode='rb') as f: + raw_body = f.read() + + headers = [] + with open(f'{filename}.mock-http-headers', mode='r') as lines: + for line in lines: + if line.startswith('HTTP/'): + continue + match = re.match(r'^([A-Za-z0-9-]+): *(.*)$', line) + if not match: + print(f'Failed to parse header line: {line}') + continue + headers.append((match.group(1), match.group(2))) + + print(pervasive_checksum.calculate_checksum(headers, raw_body)) + + +if __name__ == '__main__': + main(sys.argv) diff --git a/chromium/net/tools/cache_transparency/generate_checksums.py b/chromium/net/tools/cache_transparency/generate_checksums.py index f99a9b5ca94..db755471c46 100644 --- a/chromium/net/tools/cache_transparency/generate_checksums.py +++ b/chromium/net/tools/cache_transparency/generate_checksums.py @@ -1,4 +1,4 @@ -# Copyright 2022 The Chromium Authors. All rights reserved. +# Copyright 2022 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. """Generates checksums for URLs in the Pervasive Payload list.""" @@ -6,27 +6,14 @@ import argparse import csv import requests -import hashlib import urllib.parse - -INCLUDE_HEADERS = frozenset([ - "access-control-allow-credentials", "access-control-allow-headers", - "access-control-allow-methods", "access-control-allow-origin", - "access-control-expose-headers", "access-control-max-age", - "access-control-request-headers", "access-control-request-method", - "clear-site-data", "content-encoding", "content-security-policy", - "content-type", "cross-origin-embedder-policy", - "cross-origin-opener-policy", "cross-origin-resource-policy", "location", - "sec-websocket-accept", "sec-websocket-extensions", "sec-websocket-key", - "sec-websocket-protocol", "sec-websocket-version", "upgrade", "vary" -]) +import pervasive_checksum def generate_list_with_checksums(data): pairs_list = [] flat_list = [] for i, url_info in enumerate(data): - checksum_input = "" url = url_info[0] print(f"[{i}/{len(data)}] Fetching {url}") @@ -35,20 +22,9 @@ def generate_list_with_checksums(data): stream=True) as response: headers = list(response.headers.items()) - headers = [(name.lower(), value) for name, value in headers] - headers.sort() - - for header in headers: - if header[0] in INCLUDE_HEADERS: - checksum_input += header[0] + ": " + header[1] + "\n" - - checksum_input += "\n" - checksum_input = checksum_input.encode() - raw_body = response.raw.data - checksum_input += raw_body - checksum = hashlib.sha256(checksum_input).hexdigest().upper() + checksum = pervasive_checksum.calculate_checksum(headers, raw_body) pairs_list.append([url, checksum]) flat_list.append(str(url)) flat_list.append(str(checksum)) diff --git a/chromium/net/tools/cache_transparency/pervasive_checksum.py b/chromium/net/tools/cache_transparency/pervasive_checksum.py new file mode 100644 index 00000000000..92915b5f1d3 --- /dev/null +++ b/chromium/net/tools/cache_transparency/pervasive_checksum.py @@ -0,0 +1,45 @@ +# Copyright 2022 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +"""Calculates the pervasive payload checksum""" + +import hashlib + +INCLUDE_HEADERS = frozenset([ + "access-control-allow-credentials", "access-control-allow-headers", + "access-control-allow-methods", "access-control-allow-origin", + "access-control-expose-headers", "access-control-max-age", + "access-control-request-headers", "access-control-request-method", + "clear-site-data", "content-encoding", "content-security-policy", + "content-type", "cross-origin-embedder-policy", + "cross-origin-opener-policy", "cross-origin-resource-policy", "location", + "sec-websocket-accept", "sec-websocket-extensions", "sec-websocket-key", + "sec-websocket-protocol", "sec-websocket-version", "upgrade", "vary" +]) + + +def calculate_checksum(headers, raw_body): + """Calculates the pervasive payload checksum for a given resource + + `headers` should be a list of name, value tuples. + `raw_body` should be the response body exactly as returned by the server, + without decompression or other filtering applied. + Returns the SHA-256 checksum of the resource, calculated per the cache + transparency serialization algorithm. + """ + + checksum_input = "" + + headers = [(name.lower(), value) for name, value in headers] + headers.sort() + + for header in headers: + if header[0] in INCLUDE_HEADERS: + checksum_input += header[0] + ": " + header[1] + "\n" + + checksum_input += "\n" + checksum_input = checksum_input.encode() + + checksum_input += raw_body + + return hashlib.sha256(checksum_input).hexdigest().upper() diff --git a/chromium/net/tools/cachetool/cachetool.cc b/chromium/net/tools/cachetool/cachetool.cc index 1735d871d6d..9c70a7f5b5c 100644 --- a/chromium/net/tools/cachetool/cachetool.cc +++ b/chromium/net/tools/cachetool/cachetool.cc @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/cert_verify_tool/cert_verify_comparision_tool.cc b/chromium/net/tools/cert_verify_tool/cert_verify_comparision_tool.cc index 3cff9731feb..746513e4bd7 100644 --- a/chromium/net/tools/cert_verify_tool/cert_verify_comparision_tool.cc +++ b/chromium/net/tools/cert_verify_tool/cert_verify_comparision_tool.cc @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc b/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc index 8be41b51949..f1328b89ca7 100644 --- a/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc +++ b/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/cert_verify_tool/cert_verify_tool_util.cc b/chromium/net/tools/cert_verify_tool/cert_verify_tool_util.cc index 2bc98a38678..295c48d11a0 100644 --- a/chromium/net/tools/cert_verify_tool/cert_verify_tool_util.cc +++ b/chromium/net/tools/cert_verify_tool/cert_verify_tool_util.cc @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/cert_verify_tool/cert_verify_tool_util.h b/chromium/net/tools/cert_verify_tool/cert_verify_tool_util.h index f22f5449893..3bf361183eb 100644 --- a/chromium/net/tools/cert_verify_tool/cert_verify_tool_util.h +++ b/chromium/net/tools/cert_verify_tool/cert_verify_tool_util.h @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/cert_verify_tool/dumper.proto b/chromium/net/tools/cert_verify_tool/dumper.proto index 87ada76110d..e0ff47324d2 100644 --- a/chromium/net/tools/cert_verify_tool/dumper.proto +++ b/chromium/net/tools/cert_verify_tool/dumper.proto @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/cert_verify_tool/verify_using_cert_verify_proc.cc b/chromium/net/tools/cert_verify_tool/verify_using_cert_verify_proc.cc index bd722e313e8..cdccee731f3 100644 --- a/chromium/net/tools/cert_verify_tool/verify_using_cert_verify_proc.cc +++ b/chromium/net/tools/cert_verify_tool/verify_using_cert_verify_proc.cc @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/cert_verify_tool/verify_using_cert_verify_proc.h b/chromium/net/tools/cert_verify_tool/verify_using_cert_verify_proc.h index d77e8989ea3..1b8062ea891 100644 --- a/chromium/net/tools/cert_verify_tool/verify_using_cert_verify_proc.h +++ b/chromium/net/tools/cert_verify_tool/verify_using_cert_verify_proc.h @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/cert_verify_tool/verify_using_path_builder.cc b/chromium/net/tools/cert_verify_tool/verify_using_path_builder.cc index 49aecf25df9..99d9e39de4e 100644 --- a/chromium/net/tools/cert_verify_tool/verify_using_path_builder.cc +++ b/chromium/net/tools/cert_verify_tool/verify_using_path_builder.cc @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/cert_verify_tool/verify_using_path_builder.h b/chromium/net/tools/cert_verify_tool/verify_using_path_builder.h index 1e8e8440c80..01628a54f49 100644 --- a/chromium/net/tools/cert_verify_tool/verify_using_path_builder.h +++ b/chromium/net/tools/cert_verify_tool/verify_using_path_builder.h @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/content_decoder_tool/content_decoder_tool.cc b/chromium/net/tools/content_decoder_tool/content_decoder_tool.cc index e2b6120f55d..f14e7bf313c 100644 --- a/chromium/net/tools/content_decoder_tool/content_decoder_tool.cc +++ b/chromium/net/tools/content_decoder_tool/content_decoder_tool.cc @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/content_decoder_tool/content_decoder_tool.h b/chromium/net/tools/content_decoder_tool/content_decoder_tool.h index 32b604a2e24..2ab83ee79b1 100644 --- a/chromium/net/tools/content_decoder_tool/content_decoder_tool.h +++ b/chromium/net/tools/content_decoder_tool/content_decoder_tool.h @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/content_decoder_tool/content_decoder_tool_bin.cc b/chromium/net/tools/content_decoder_tool/content_decoder_tool_bin.cc index 6dc3ea7ad26..d4cab40f953 100644 --- a/chromium/net/tools/content_decoder_tool/content_decoder_tool_bin.cc +++ b/chromium/net/tools/content_decoder_tool/content_decoder_tool_bin.cc @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/content_decoder_tool/content_decoder_tool_unittest.cc b/chromium/net/tools/content_decoder_tool/content_decoder_tool_unittest.cc index 83656cfa93d..c2781389444 100644 --- a/chromium/net/tools/content_decoder_tool/content_decoder_tool_unittest.cc +++ b/chromium/net/tools/content_decoder_tool/content_decoder_tool_unittest.cc @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/crash_cache/crash_cache.cc b/chromium/net/tools/crash_cache/crash_cache.cc index a506819f2f6..ae926bdb0e3 100644 --- a/chromium/net/tools/crash_cache/crash_cache.cc +++ b/chromium/net/tools/crash_cache/crash_cache.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright 2011 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/dafsa/PRESUBMIT.py b/chromium/net/tools/dafsa/PRESUBMIT.py index 77daed6f3af..c4d19db6898 100644 --- a/chromium/net/tools/dafsa/PRESUBMIT.py +++ b/chromium/net/tools/dafsa/PRESUBMIT.py @@ -1,4 +1,4 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. +# Copyright 2014 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/net/tools/dafsa/make_dafsa.py b/chromium/net/tools/dafsa/make_dafsa.py index eb0094326c1..6361b0b95d8 100755 --- a/chromium/net/tools/dafsa/make_dafsa.py +++ b/chromium/net/tools/dafsa/make_dafsa.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright 2014 The Chromium Authors. All rights reserved. +# Copyright 2014 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/net/tools/dafsa/make_dafsa_unittest.py b/chromium/net/tools/dafsa/make_dafsa_unittest.py index 42272fe6c0b..e46ff05d8ae 100755 --- a/chromium/net/tools/dafsa/make_dafsa_unittest.py +++ b/chromium/net/tools/dafsa/make_dafsa_unittest.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright 2014 The Chromium Authors. All rights reserved. +# Copyright 2014 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/net/tools/disk_cache_memory_test/disk_cache_memory_test.cc b/chromium/net/tools/disk_cache_memory_test/disk_cache_memory_test.cc index 9f64051a51c..a1e7d486e5d 100644 --- a/chromium/net/tools/disk_cache_memory_test/disk_cache_memory_test.cc +++ b/chromium/net/tools/disk_cache_memory_test/disk_cache_memory_test.cc @@ -1,4 +1,4 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/dump_cache/dump_cache.cc b/chromium/net/tools/dump_cache/dump_cache.cc index c79a55f0730..16ae2dc042c 100644 --- a/chromium/net/tools/dump_cache/dump_cache.cc +++ b/chromium/net/tools/dump_cache/dump_cache.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/dump_cache/dump_files.cc b/chromium/net/tools/dump_cache/dump_files.cc index 037618d6c00..817dbb0067f 100644 --- a/chromium/net/tools/dump_cache/dump_files.cc +++ b/chromium/net/tools/dump_cache/dump_files.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/dump_cache/dump_files.h b/chromium/net/tools/dump_cache/dump_files.h index 365d6b0e5fd..8a6c83c1245 100644 --- a/chromium/net/tools/dump_cache/dump_files.h +++ b/chromium/net/tools/dump_cache/dump_files.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/gssapi/gss_import_name.cc b/chromium/net/tools/gssapi/gss_import_name.cc index fd5a8ec4cc8..153c3b1e042 100644 --- a/chromium/net/tools/gssapi/gss_import_name.cc +++ b/chromium/net/tools/gssapi/gss_import_name.cc @@ -1,4 +1,4 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. +// Copyright 2019 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/gssapi/gss_methods.cc b/chromium/net/tools/gssapi/gss_methods.cc index 6a1647ea879..88d0dd9968a 100644 --- a/chromium/net/tools/gssapi/gss_methods.cc +++ b/chromium/net/tools/gssapi/gss_methods.cc @@ -1,4 +1,4 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. +// Copyright 2019 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/gssapi/gss_types.h b/chromium/net/tools/gssapi/gss_types.h index a6431033d78..3b8dac86f1c 100644 --- a/chromium/net/tools/gssapi/gss_types.h +++ b/chromium/net/tools/gssapi/gss_types.h @@ -1,4 +1,4 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. +// Copyright 2019 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/huffman_trie/BUILD.gn b/chromium/net/tools/huffman_trie/BUILD.gn index efa731b1013..4e9331ab569 100644 --- a/chromium/net/tools/huffman_trie/BUILD.gn +++ b/chromium/net/tools/huffman_trie/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/net/tools/huffman_trie/bit_writer.cc b/chromium/net/tools/huffman_trie/bit_writer.cc index 077024862a9..33a8fda437e 100644 --- a/chromium/net/tools/huffman_trie/bit_writer.cc +++ b/chromium/net/tools/huffman_trie/bit_writer.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/huffman_trie/bit_writer.h b/chromium/net/tools/huffman_trie/bit_writer.h index e91b487c1b0..7927dec09a1 100644 --- a/chromium/net/tools/huffman_trie/bit_writer.h +++ b/chromium/net/tools/huffman_trie/bit_writer.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/huffman_trie/bit_writer_unittest.cc b/chromium/net/tools/huffman_trie/bit_writer_unittest.cc index deb373167df..88ac1fd5ba7 100644 --- a/chromium/net/tools/huffman_trie/bit_writer_unittest.cc +++ b/chromium/net/tools/huffman_trie/bit_writer_unittest.cc @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/huffman_trie/huffman/huffman_builder.cc b/chromium/net/tools/huffman_trie/huffman/huffman_builder.cc index cc7945a1180..dba1427dea6 100644 --- a/chromium/net/tools/huffman_trie/huffman/huffman_builder.cc +++ b/chromium/net/tools/huffman_trie/huffman/huffman_builder.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/huffman_trie/huffman/huffman_builder.h b/chromium/net/tools/huffman_trie/huffman/huffman_builder.h index 3126650db6f..397863d4bf4 100644 --- a/chromium/net/tools/huffman_trie/huffman/huffman_builder.h +++ b/chromium/net/tools/huffman_trie/huffman/huffman_builder.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/huffman_trie/huffman/huffman_builder_unittest.cc b/chromium/net/tools/huffman_trie/huffman/huffman_builder_unittest.cc index 249065d218f..7cf3ee92417 100644 --- a/chromium/net/tools/huffman_trie/huffman/huffman_builder_unittest.cc +++ b/chromium/net/tools/huffman_trie/huffman/huffman_builder_unittest.cc @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/huffman_trie/trie/trie_bit_buffer.cc b/chromium/net/tools/huffman_trie/trie/trie_bit_buffer.cc index 920f5b616e9..305b0caa310 100644 --- a/chromium/net/tools/huffman_trie/trie/trie_bit_buffer.cc +++ b/chromium/net/tools/huffman_trie/trie/trie_bit_buffer.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/huffman_trie/trie/trie_bit_buffer.h b/chromium/net/tools/huffman_trie/trie/trie_bit_buffer.h index 02cd1e3f38e..b9d181673a7 100644 --- a/chromium/net/tools/huffman_trie/trie/trie_bit_buffer.h +++ b/chromium/net/tools/huffman_trie/trie/trie_bit_buffer.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/huffman_trie/trie/trie_bit_buffer_unittest.cc b/chromium/net/tools/huffman_trie/trie/trie_bit_buffer_unittest.cc index 19289a1a1c7..5c4e8f366ff 100644 --- a/chromium/net/tools/huffman_trie/trie/trie_bit_buffer_unittest.cc +++ b/chromium/net/tools/huffman_trie/trie/trie_bit_buffer_unittest.cc @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/huffman_trie/trie/trie_writer.cc b/chromium/net/tools/huffman_trie/trie/trie_writer.cc index 61217051791..296fdd5a417 100644 --- a/chromium/net/tools/huffman_trie/trie/trie_writer.cc +++ b/chromium/net/tools/huffman_trie/trie/trie_writer.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/huffman_trie/trie/trie_writer.h b/chromium/net/tools/huffman_trie/trie/trie_writer.h index 51863ca22de..612db76cb82 100644 --- a/chromium/net/tools/huffman_trie/trie/trie_writer.h +++ b/chromium/net/tools/huffman_trie/trie/trie_writer.h @@ -1,4 +1,4 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. +// Copyright 2018 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/huffman_trie/trie_entry.cc b/chromium/net/tools/huffman_trie/trie_entry.cc index a2dc0e62972..ef47dd0576a 100644 --- a/chromium/net/tools/huffman_trie/trie_entry.cc +++ b/chromium/net/tools/huffman_trie/trie_entry.cc @@ -1,4 +1,4 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. +// Copyright 2018 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/huffman_trie/trie_entry.h b/chromium/net/tools/huffman_trie/trie_entry.h index 9cf03587014..6fc6933b0c0 100644 --- a/chromium/net/tools/huffman_trie/trie_entry.h +++ b/chromium/net/tools/huffman_trie/trie_entry.h @@ -1,4 +1,4 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. +// Copyright 2018 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/net_docs/net_docs.py b/chromium/net/tools/net_docs/net_docs.py index 2dd30de87fe..9cadb8730d6 100755 --- a/chromium/net/tools/net_docs/net_docs.py +++ b/chromium/net/tools/net_docs/net_docs.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2015 The Chromium Authors. All rights reserved. +# Copyright 2015 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/net/tools/net_watcher/net_watcher.cc b/chromium/net/tools/net_watcher/net_watcher.cc index 00fbd793dd1..30e2a484ceb 100644 --- a/chromium/net/tools/net_watcher/net_watcher.cc +++ b/chromium/net/tools/net_watcher/net_watcher.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/print_certificates.py b/chromium/net/tools/print_certificates.py index 4a0256266b4..323edffec97 100755 --- a/chromium/net/tools/print_certificates.py +++ b/chromium/net/tools/print_certificates.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright 2017 The Chromium Authors. All rights reserved. +# Copyright 2017 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/net/tools/quic/benchmark/run_client.py b/chromium/net/tools/quic/benchmark/run_client.py index 7df37ab7fa0..dc421018d77 100755 --- a/chromium/net/tools/quic/benchmark/run_client.py +++ b/chromium/net/tools/quic/benchmark/run_client.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright 2013 The Chromium Authors. All rights reserved. +# Copyright 2013 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/net/tools/quic/certs/generate-certs.sh b/chromium/net/tools/quic/certs/generate-certs.sh index 11dde0703a6..18799c833cd 100755 --- a/chromium/net/tools/quic/certs/generate-certs.sh +++ b/chromium/net/tools/quic/certs/generate-certs.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2015 The Chromium Authors. All rights reserved. +# Copyright 2015 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/net/tools/quic/crypto_message_printer_bin.cc b/chromium/net/tools/quic/crypto_message_printer_bin.cc index 51156bd5843..ed2581634b0 100644 --- a/chromium/net/tools/quic/crypto_message_printer_bin.cc +++ b/chromium/net/tools/quic/crypto_message_printer_bin.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/quic/quic_client_message_loop_network_helper.cc b/chromium/net/tools/quic/quic_client_message_loop_network_helper.cc index fa4e7cd697f..50e90d79442 100644 --- a/chromium/net/tools/quic/quic_client_message_loop_network_helper.cc +++ b/chromium/net/tools/quic/quic_client_message_loop_network_helper.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -53,7 +53,7 @@ bool QuicClientMessageLooplNetworkHelper::CreateUDPSocketAndBind( client_address_ = quic::QuicSocketAddress(bind_to_address, client_->local_port()); } else if (server_address.host().address_family() == - quic::IpAddressFamily::IP_V4) { + quiche::IpAddressFamily::IP_V4) { client_address_ = quic::QuicSocketAddress(quic::QuicIpAddress::Any4(), bind_to_port); } else { diff --git a/chromium/net/tools/quic/quic_client_message_loop_network_helper.h b/chromium/net/tools/quic/quic_client_message_loop_network_helper.h index e11e4c5a41b..f1c09b71f4d 100644 --- a/chromium/net/tools/quic/quic_client_message_loop_network_helper.h +++ b/chromium/net/tools/quic/quic_client_message_loop_network_helper.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/chromium/net/tools/quic/quic_simple_client.cc b/chromium/net/tools/quic/quic_simple_client.cc index ff8703ee7e7..35c8514258c 100644 --- a/chromium/net/tools/quic/quic_simple_client.cc +++ b/chromium/net/tools/quic/quic_simple_client.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -63,8 +63,9 @@ std::unique_ptr<quic::QuicSession> QuicSimpleClient::CreateQuicClientSession( const quic::ParsedQuicVersionVector& supported_versions, quic::QuicConnection* connection) { return std::make_unique<quic::QuicSimpleClientSession>( - *config(), supported_versions, connection, server_id(), crypto_config(), - push_promise_index(), drop_response_body()); + *config(), supported_versions, connection, network_helper(), server_id(), + crypto_config(), push_promise_index(), drop_response_body(), + /*enable_web_transport=*/false); } QuicChromiumConnectionHelper* QuicSimpleClient::CreateQuicConnectionHelper() { diff --git a/chromium/net/tools/quic/quic_simple_client.h b/chromium/net/tools/quic/quic_simple_client.h index 01f8f4cc609..e307bab1ef9 100644 --- a/chromium/net/tools/quic/quic_simple_client.h +++ b/chromium/net/tools/quic/quic_simple_client.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/chromium/net/tools/quic/quic_simple_client_bin.cc b/chromium/net/tools/quic/quic_simple_client_bin.cc index a4c88a5fbe6..519d2ec890b 100644 --- a/chromium/net/tools/quic/quic_simple_client_bin.cc +++ b/chromium/net/tools/quic/quic_simple_client_bin.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/quic/quic_simple_client_test.cc b/chromium/net/tools/quic/quic_simple_client_test.cc index 8bc6d16a58e..500012bfbb5 100644 --- a/chromium/net/tools/quic/quic_simple_client_test.cc +++ b/chromium/net/tools/quic/quic_simple_client_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/quic/quic_simple_server.cc b/chromium/net/tools/quic/quic_simple_server.cc index e3fe44894c8..6a28de20020 100644 --- a/chromium/net/tools/quic/quic_simple_server.cc +++ b/chromium/net/tools/quic/quic_simple_server.cc @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -61,7 +61,8 @@ QuicSimpleServer::QuicSimpleServer( std::move(proof_source), quic::KeyExchangeSource::Default()), read_buffer_(base::MakeRefCounted<IOBufferWithSize>(kReadBufferSize)), - quic_simple_server_backend_(quic_simple_server_backend) { + quic_simple_server_backend_(quic_simple_server_backend), + connection_id_generator_(quic::kQuicDefaultConnectionIdLength) { DCHECK(quic_simple_server_backend); Initialize(); } @@ -114,7 +115,8 @@ bool QuicSimpleServer::Listen(const IPEndPoint& address) { std::make_unique<QuicSimpleServerSessionHelper>( quic::QuicRandom::GetInstance()), std::unique_ptr<quic::QuicAlarmFactory>(alarm_factory_), - quic_simple_server_backend_, quic::kQuicDefaultConnectionIdLength); + quic_simple_server_backend_, quic::kQuicDefaultConnectionIdLength, + connection_id_generator_); QuicSimpleServerPacketWriter* writer = new QuicSimpleServerPacketWriter(socket_.get(), dispatcher_.get()); dispatcher_->InitializeWithWriter(writer); diff --git a/chromium/net/tools/quic/quic_simple_server.h b/chromium/net/tools/quic/quic_simple_server.h index c6f6f4817c6..7b0647f5ee6 100644 --- a/chromium/net/tools/quic/quic_simple_server.h +++ b/chromium/net/tools/quic/quic_simple_server.h @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -16,6 +16,7 @@ #include "net/quic/quic_chromium_alarm_factory.h" #include "net/quic/quic_chromium_connection_helper.h" #include "net/third_party/quiche/src/quiche/quic/core/crypto/quic_crypto_server_config.h" +#include "net/third_party/quiche/src/quiche/quic/core/deterministic_connection_id_generator.h" #include "net/third_party/quiche/src/quiche/quic/core/quic_config.h" #include "net/third_party/quiche/src/quiche/quic/core/quic_version_manager.h" #include "net/third_party/quiche/src/quiche/quic/tools/quic_simple_server_backend.h" @@ -123,6 +124,8 @@ class QuicSimpleServer : public quic::QuicSpdyServerBase { quic::QuicSimpleServerBackend* quic_simple_server_backend_; + quic::DeterministicConnectionIdGenerator connection_id_generator_; + base::WeakPtrFactory<QuicSimpleServer> weak_factory_{this}; }; diff --git a/chromium/net/tools/quic/quic_simple_server_backend_factory.cc b/chromium/net/tools/quic/quic_simple_server_backend_factory.cc index f8d70bcab81..acaa0bf5b8e 100644 --- a/chromium/net/tools/quic/quic_simple_server_backend_factory.cc +++ b/chromium/net/tools/quic/quic_simple_server_backend_factory.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2019 The Chromium Authors. All rights reserved. +// Copyright 2019 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/quic/quic_simple_server_backend_factory.h b/chromium/net/tools/quic/quic_simple_server_backend_factory.h index 041f0f2d5fc..c6f24e38fbb 100644 --- a/chromium/net/tools/quic/quic_simple_server_backend_factory.h +++ b/chromium/net/tools/quic/quic_simple_server_backend_factory.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/quic/quic_simple_server_bin.cc b/chromium/net/tools/quic/quic_simple_server_bin.cc index 4d847f3107f..d2b3bbeed77 100644 --- a/chromium/net/tools/quic/quic_simple_server_bin.cc +++ b/chromium/net/tools/quic/quic_simple_server_bin.cc @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/quic/quic_simple_server_packet_writer.cc b/chromium/net/tools/quic/quic_simple_server_packet_writer.cc index 8d13498040c..306e01d7831 100644 --- a/chromium/net/tools/quic/quic_simple_server_packet_writer.cc +++ b/chromium/net/tools/quic/quic_simple_server_packet_writer.cc @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/quic/quic_simple_server_packet_writer.h b/chromium/net/tools/quic/quic_simple_server_packet_writer.h index 667980af838..a026df39026 100644 --- a/chromium/net/tools/quic/quic_simple_server_packet_writer.h +++ b/chromium/net/tools/quic/quic_simple_server_packet_writer.h @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/quic/quic_simple_server_session_helper.cc b/chromium/net/tools/quic/quic_simple_server_session_helper.cc index 80e0ef26882..10f1af2e26b 100644 --- a/chromium/net/tools/quic/quic_simple_server_session_helper.cc +++ b/chromium/net/tools/quic/quic_simple_server_session_helper.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/quic/quic_simple_server_session_helper.h b/chromium/net/tools/quic/quic_simple_server_session_helper.h index 664523a9642..6ac57dc2ba5 100644 --- a/chromium/net/tools/quic/quic_simple_server_session_helper.h +++ b/chromium/net/tools/quic/quic_simple_server_session_helper.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/quic/quic_simple_server_socket.cc b/chromium/net/tools/quic/quic_simple_server_socket.cc index d500012884a..86912d9594c 100644 --- a/chromium/net/tools/quic/quic_simple_server_socket.cc +++ b/chromium/net/tools/quic/quic_simple_server_socket.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2019 The Chromium Authors. All rights reserved. +// Copyright 2019 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/quic/quic_simple_server_socket.h b/chromium/net/tools/quic/quic_simple_server_socket.h index 56cf9d9ceb4..1fe11ab2308 100644 --- a/chromium/net/tools/quic/quic_simple_server_socket.h +++ b/chromium/net/tools/quic/quic_simple_server_socket.h @@ -1,4 +1,4 @@ -// Copyright (c) 2019 The Chromium Authors. All rights reserved. +// Copyright 2019 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/quic/quic_simple_server_test.cc b/chromium/net/tools/quic/quic_simple_server_test.cc index 9681310e155..5bc56f8001e 100644 --- a/chromium/net/tools/quic/quic_simple_server_test.cc +++ b/chromium/net/tools/quic/quic_simple_server_test.cc @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,6 +8,7 @@ #include "net/quic/address_utils.h" #include "net/third_party/quiche/src/quiche/quic/core/crypto/quic_random.h" +#include "net/third_party/quiche/src/quiche/quic/core/deterministic_connection_id_generator.h" #include "net/third_party/quiche/src/quiche/quic/core/quic_crypto_stream.h" #include "net/third_party/quiche/src/quiche/quic/core/quic_utils.h" #include "net/third_party/quiche/src/quiche/quic/platform/api/quic_test.h" @@ -31,28 +32,32 @@ class QuicChromeServerDispatchPacketTest : public ::testing::Test { quic::test::crypto_test_utils::ProofSourceForTesting(), quic::KeyExchangeSource::Default()), version_manager_(quic::AllSupportedVersions()), - dispatcher_(&config_, - &crypto_config_, - &version_manager_, - std::make_unique<quic::test::MockQuicConnectionHelper>(), - std::make_unique<QuicSimpleServerSessionHelper>( - quic::QuicRandom::GetInstance()), - std::make_unique<quic::test::MockAlarmFactory>(), - &memory_cache_backend_) { - dispatcher_.InitializeWithWriter(nullptr); + connection_id_generator_(quic::kQuicDefaultConnectionIdLength), + dispatcher_(std::make_unique<quic::test::MockQuicDispatcher>( + &config_, + &crypto_config_, + &version_manager_, + std::make_unique<quic::test::MockQuicConnectionHelper>(), + std::make_unique<QuicSimpleServerSessionHelper>( + quic::QuicRandom::GetInstance()), + std::make_unique<quic::test::MockAlarmFactory>(), + &memory_cache_backend_, + connection_id_generator_)) { + dispatcher_->InitializeWithWriter(nullptr); } void DispatchPacket(const quic::QuicReceivedPacket& packet) { IPEndPoint client_addr, server_addr; - dispatcher_.ProcessPacket(ToQuicSocketAddress(server_addr), - ToQuicSocketAddress(client_addr), packet); + dispatcher_->ProcessPacket(ToQuicSocketAddress(server_addr), + ToQuicSocketAddress(client_addr), packet); } protected: quic::QuicConfig config_; quic::QuicCryptoServerConfig crypto_config_; quic::QuicVersionManager version_manager_; - quic::test::MockQuicDispatcher dispatcher_; + quic::DeterministicConnectionIdGenerator connection_id_generator_; + std::unique_ptr<quic::test::MockQuicDispatcher> dispatcher_; quic::QuicMemoryCacheBackend memory_cache_backend_; }; @@ -70,7 +75,7 @@ TEST_F(QuicChromeServerDispatchPacketTest, DispatchPacket) { reinterpret_cast<char*>(valid_packet), std::size(valid_packet), quic::QuicTime::Zero(), false); - EXPECT_CALL(dispatcher_, ProcessPacket(_, _, _)).Times(1); + EXPECT_CALL(*dispatcher_, ProcessPacket(_, _, _)).Times(1); DispatchPacket(encrypted_valid_packet); } diff --git a/chromium/net/tools/quic/synchronous_host_resolver.cc b/chromium/net/tools/quic/synchronous_host_resolver.cc index a205e3f7f48..722d46663c8 100644 --- a/chromium/net/tools/quic/synchronous_host_resolver.cc +++ b/chromium/net/tools/quic/synchronous_host_resolver.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2015 The Chromium Authors. All rights reserved. +// Copyright 2015 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -67,10 +67,10 @@ void ResolverThread::Run() { std::unique_ptr<net::HostResolver> resolver = net::HostResolver::CreateStandaloneResolver(NetLog::Get(), options); - // No need to use a NetworkIsolationKey here, since this is an external tool - // not used by net/ consumers. + // No need to use a NetworkAnonymizationKey here, since this is an external + // tool not used by net/ consumers. std::unique_ptr<net::HostResolver::ResolveHostRequest> request = - resolver->CreateRequest(scheme_host_port_, NetworkIsolationKey(), + resolver->CreateRequest(scheme_host_port_, NetworkAnonymizationKey(), NetLogWithSource(), absl::nullopt); base::RunLoop run_loop; diff --git a/chromium/net/tools/quic/synchronous_host_resolver.h b/chromium/net/tools/quic/synchronous_host_resolver.h index 8bb511d15ed..8b7189431f5 100644 --- a/chromium/net/tools/quic/synchronous_host_resolver.h +++ b/chromium/net/tools/quic/synchronous_host_resolver.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015 The Chromium Authors. All rights reserved. +// Copyright 2015 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/chromium/net/tools/root_store_tool/BUILD.gn b/chromium/net/tools/root_store_tool/BUILD.gn index 51a79d29d0a..8d2572e2727 100644 --- a/chromium/net/tools/root_store_tool/BUILD.gn +++ b/chromium/net/tools/root_store_tool/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/net/tools/root_store_tool/root_store_tool.cc b/chromium/net/tools/root_store_tool/root_store_tool.cc index 117e05a4b97..09a1b69e3e9 100644 --- a/chromium/net/tools/root_store_tool/root_store_tool.cc +++ b/chromium/net/tools/root_store_tool/root_store_tool.cc @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -192,6 +192,12 @@ bool WriteEvCppFile(const RootStore& root_store, for (auto& anchor : root_store.trust_anchors()) { // Every trust anchor at this point should have a DER. CHECK(!anchor.der().empty()); + if (anchor.ev_policy_oids_size() == 0) { + // The same input file is used for the Chrome Root Store and EV enabled + // certificates. Skip anchors that have no EV policy OIDs when generating + // the EV include file. + continue; + } std::string sha256_hash = crypto::SHA256HashString(anchor.der()); @@ -231,9 +237,6 @@ bool WriteEvCppFile(const RootStore& root_store, if (oids_size > kMaxPolicyOids) { PLOG(ERROR) << hexencode_hash << " has too many OIDs!"; return false; - } else if (oids_size < 1) { - PLOG(ERROR) << hexencode_hash << " has no OIDs!"; - return false; } for (int i = 0; i < kMaxPolicyOids; i++) { std::string oid; @@ -255,10 +258,6 @@ bool WriteEvCppFile(const RootStore& root_store, return true; } -bool ValidCppOutputFormatValue(base::StringPiece value) { - return (value == "root" || value == "ev"); -} - } // namespace int main(int argc, char** argv) { @@ -274,23 +273,23 @@ int main(int argc, char** argv) { base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); base::FilePath proto_path = command_line.GetSwitchValuePath("write-proto"); - base::FilePath cpp_path = command_line.GetSwitchValuePath("write-cpp"); - std::string cpp_output_format = - command_line.GetSwitchValueASCII("cpp-output-format"); + base::FilePath root_store_cpp_path = + command_line.GetSwitchValuePath("write-cpp-root-store"); + base::FilePath ev_roots_cpp_path = + command_line.GetSwitchValuePath("write-cpp-ev-roots"); base::FilePath root_store_path = command_line.GetSwitchValuePath("root-store"); base::FilePath certs_path = command_line.GetSwitchValuePath("certs"); - if ((proto_path.empty() && cpp_path.empty()) || root_store_path.empty() || - command_line.HasSwitch("help") || - (!cpp_path.empty() && !ValidCppOutputFormatValue(cpp_output_format))) { - std::cerr << cpp_output_format << " "; + if ((proto_path.empty() && root_store_cpp_path.empty() && + ev_roots_cpp_path.empty()) || + root_store_path.empty() || command_line.HasSwitch("help")) { std::cerr << "Usage: root_store_tool " << "--root-store=TEXTPROTO_FILE " << "[--certs=CERTS_FILE] " << "[--write-proto=PROTO_FILE] " - << "[--write-cpp=CPP_FILE --cpp-output-format=[ev|root]] " - << std::endl; + << "[--write-cpp-root-store=CPP_FILE] " + << "[--write-cpp-ev-roots=CPP_FILE] " << std::endl; return 1; } @@ -317,20 +316,15 @@ int main(int argc, char** argv) { } } - if (!cpp_path.empty()) { - bool success; - if (cpp_output_format == "root") { - success = WriteRootCppFile(*root_store, cpp_path); - } else if (cpp_output_format == "ev") { - success = WriteEvCppFile(*root_store, cpp_path); - } else { - // Unknown format. - success = false; - } - if (!success) { - PLOG(ERROR) << "Error writing cpp include file"; - return 1; - } + if (!root_store_cpp_path.empty() && + !WriteRootCppFile(*root_store, root_store_cpp_path)) { + PLOG(ERROR) << "Error writing root store C++ include file"; + return 1; + } + if (!ev_roots_cpp_path.empty() && + !WriteEvCppFile(*root_store, ev_roots_cpp_path)) { + PLOG(ERROR) << "Error writing EV roots C++ include file"; + return 1; } return 0; diff --git a/chromium/net/tools/stitch_net_log_files.py b/chromium/net/tools/stitch_net_log_files.py index d81d792ddf9..97c8d034957 100755 --- a/chromium/net/tools/stitch_net_log_files.py +++ b/chromium/net/tools/stitch_net_log_files.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2016 The Chromium Authors. All rights reserved. +# Copyright 2016 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/net/tools/stress_cache/stress_cache.cc b/chromium/net/tools/stress_cache/stress_cache.cc index 4561e5e0b03..d0a3ba043d7 100644 --- a/chromium/net/tools/stress_cache/stress_cache.cc +++ b/chromium/net/tools/stress_cache/stress_cache.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/testserver/BUILD.gn b/chromium/net/tools/testserver/BUILD.gn index 443d1c23b53..cf2aa799224 100644 --- a/chromium/net/tools/testserver/BUILD.gn +++ b/chromium/net/tools/testserver/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2016 The Chromium Authors. All rights reserved. +# Copyright 2016 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/net/tools/testserver/backoff_server.py b/chromium/net/tools/testserver/backoff_server.py index ca2c57cbf12..0a236c124df 100755 --- a/chromium/net/tools/testserver/backoff_server.py +++ b/chromium/net/tools/testserver/backoff_server.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (c) 2012 The Chromium Authors. All rights reserved. +# Copyright 2012 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/net/tools/testserver/run_testserver.cc b/chromium/net/tools/testserver/run_testserver.cc index 3bfabcf05d1..d110d2de579 100644 --- a/chromium/net/tools/testserver/run_testserver.cc +++ b/chromium/net/tools/testserver/run_testserver.cc @@ -1,4 +1,4 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/testserver/testserver.py b/chromium/net/tools/testserver/testserver.py index 400e5939504..98bdb6af752 100755 --- a/chromium/net/tools/testserver/testserver.py +++ b/chromium/net/tools/testserver/testserver.py @@ -1,5 +1,5 @@ #!/usr/bin/env vpython3 -# Copyright 2013 The Chromium Authors. All rights reserved. +# Copyright 2013 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/net/tools/testserver/testserver_base.py b/chromium/net/tools/testserver/testserver_base.py index 319afd4e76e..d52fc5d1fe1 100644 --- a/chromium/net/tools/testserver/testserver_base.py +++ b/chromium/net/tools/testserver/testserver_base.py @@ -1,4 +1,4 @@ -# Copyright 2013 The Chromium Authors. All rights reserved. +# Copyright 2013 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/net/tools/tld_cleanup/BUILD.gn b/chromium/net/tools/tld_cleanup/BUILD.gn index bf89c008bb0..d25e2cb86b9 100644 --- a/chromium/net/tools/tld_cleanup/BUILD.gn +++ b/chromium/net/tools/tld_cleanup/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. +# Copyright 2014 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/net/tools/tld_cleanup/OWNERS b/chromium/net/tools/tld_cleanup/OWNERS deleted file mode 100644 index f6e734a6894..00000000000 --- a/chromium/net/tools/tld_cleanup/OWNERS +++ /dev/null @@ -1 +0,0 @@ -pam@chromium.org diff --git a/chromium/net/tools/tld_cleanup/tld_cleanup.cc b/chromium/net/tools/tld_cleanup/tld_cleanup.cc index 2c33e66a7c5..9d7056ab40a 100644 --- a/chromium/net/tools/tld_cleanup/tld_cleanup.cc +++ b/chromium/net/tools/tld_cleanup/tld_cleanup.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/tld_cleanup/tld_cleanup_util.cc b/chromium/net/tools/tld_cleanup/tld_cleanup_util.cc index b2eee20f156..d5ea3adc18e 100644 --- a/chromium/net/tools/tld_cleanup/tld_cleanup_util.cc +++ b/chromium/net/tools/tld_cleanup/tld_cleanup_util.cc @@ -1,4 +1,4 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -29,7 +29,7 @@ namespace net::tld_cleanup { bool WriteRules(const RuleMap& rules, const base::FilePath& outfile) { std::string data; data.append("%{\n" - "// Copyright 2012 The Chromium Authors. All rights reserved.\n" + "// Copyright 2012 The Chromium Authors\n" "// Use of this source code is governed by a BSD-style license " "that can be\n" "// found in the LICENSE file.\n\n" diff --git a/chromium/net/tools/tld_cleanup/tld_cleanup_util.h b/chromium/net/tools/tld_cleanup/tld_cleanup_util.h index 0919a74d0d3..0e773fc8b47 100644 --- a/chromium/net/tools/tld_cleanup/tld_cleanup_util.h +++ b/chromium/net/tools/tld_cleanup/tld_cleanup_util.h @@ -1,4 +1,4 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/tld_cleanup/tld_cleanup_util_unittest.cc b/chromium/net/tools/tld_cleanup/tld_cleanup_util_unittest.cc index 85f691ce7c9..16033a90f11 100644 --- a/chromium/net/tools/tld_cleanup/tld_cleanup_util_unittest.cc +++ b/chromium/net/tools/tld_cleanup/tld_cleanup_util_unittest.cc @@ -1,4 +1,4 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/transport_security_state_generator/BUILD.gn b/chromium/net/tools/transport_security_state_generator/BUILD.gn index 1c01def8826..6069a30232c 100644 --- a/chromium/net/tools/transport_security_state_generator/BUILD.gn +++ b/chromium/net/tools/transport_security_state_generator/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2017 The Chromium Authors. All rights reserved. +# Copyright 2017 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/net/tools/transport_security_state_generator/cert_util.cc b/chromium/net/tools/transport_security_state_generator/cert_util.cc index 34052f2b6b3..10db0b33b1f 100644 --- a/chromium/net/tools/transport_security_state_generator/cert_util.cc +++ b/chromium/net/tools/transport_security_state_generator/cert_util.cc @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/transport_security_state_generator/cert_util.h b/chromium/net/tools/transport_security_state_generator/cert_util.h index 572246d695a..ade91adc87c 100644 --- a/chromium/net/tools/transport_security_state_generator/cert_util.h +++ b/chromium/net/tools/transport_security_state_generator/cert_util.h @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/transport_security_state_generator/cert_util_unittest.cc b/chromium/net/tools/transport_security_state_generator/cert_util_unittest.cc index 5f741fa114b..5a585faf49b 100644 --- a/chromium/net/tools/transport_security_state_generator/cert_util_unittest.cc +++ b/chromium/net/tools/transport_security_state_generator/cert_util_unittest.cc @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/transport_security_state_generator/input_file_parsers.cc b/chromium/net/tools/transport_security_state_generator/input_file_parsers.cc index 1edd25ac014..c9d37387df7 100644 --- a/chromium/net/tools/transport_security_state_generator/input_file_parsers.cc +++ b/chromium/net/tools/transport_security_state_generator/input_file_parsers.cc @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -340,15 +340,15 @@ bool ParseJSON(base::StringPiece json, return false; } - const base::Value* preload_entries = value->FindListKey("entries"); - if (!preload_entries) { + const base::Value::List* preload_entries_list = + value->GetDict().FindList("entries"); + if (!preload_entries_list) { LOG(ERROR) << "Could not parse the entries in the input JSON"; return false; } - const auto preload_entries_list = preload_entries->GetListDeprecated(); - for (size_t i = 0; i < preload_entries_list.size(); ++i) { - const base::Value& parsed = preload_entries_list[i]; + for (size_t i = 0; i < preload_entries_list->size(); ++i) { + const base::Value& parsed = (*preload_entries_list)[i]; if (!parsed.is_dict()) { LOG(ERROR) << "Could not parse entry " << base::NumberToString(i) << " in the input JSON"; @@ -411,15 +411,14 @@ bool ParseJSON(base::StringPiece json, entries->push_back(std::move(entry)); } - base::Value* pinsets_value = value->FindListKey("pinsets"); - if (!pinsets_value) { + base::Value::List* pinsets_list = value->GetDict().FindList("pinsets"); + if (!pinsets_list) { LOG(ERROR) << "Could not parse the pinsets in the input JSON"; return false; } - const auto pinsets_list = pinsets_value->GetListDeprecated(); - for (size_t i = 0; i < pinsets_list.size(); ++i) { - const base::Value& parsed = pinsets_list[i]; + for (size_t i = 0; i < pinsets_list->size(); ++i) { + const base::Value& parsed = (*pinsets_list)[i]; if (!parsed.is_dict()) { LOG(ERROR) << "Could not parse pinset " << base::NumberToString(i) << " in the input JSON"; @@ -440,10 +439,10 @@ bool ParseJSON(base::StringPiece json, auto pinset = std::make_unique<Pinset>(name, report_uri); - const base::Value* pinset_static_hashes_list = - parsed.FindListKey("static_spki_hashes"); + const base::Value::List* pinset_static_hashes_list = + parsed.GetDict().FindList("static_spki_hashes"); if (pinset_static_hashes_list) { - for (const auto& hash : pinset_static_hashes_list->GetListDeprecated()) { + for (const auto& hash : *pinset_static_hashes_list) { if (!hash.is_string()) { LOG(ERROR) << "Could not parse static spki hash " << hash.DebugString() << " in the input JSON"; @@ -453,11 +452,10 @@ bool ParseJSON(base::StringPiece json, } } - const base::Value* pinset_bad_static_hashes_list = - parsed.FindListKey("bad_static_spki_hashes"); + const base::Value::List* pinset_bad_static_hashes_list = + parsed.GetDict().FindList("bad_static_spki_hashes"); if (pinset_bad_static_hashes_list) { - for (const auto& hash : - pinset_bad_static_hashes_list->GetListDeprecated()) { + for (const auto& hash : *pinset_bad_static_hashes_list) { if (!hash.is_string()) { LOG(ERROR) << "Could not parse bad static spki hash " << hash.DebugString() << " in the input JSON"; diff --git a/chromium/net/tools/transport_security_state_generator/input_file_parsers.h b/chromium/net/tools/transport_security_state_generator/input_file_parsers.h index abf5a921279..8d131d9c2ba 100644 --- a/chromium/net/tools/transport_security_state_generator/input_file_parsers.h +++ b/chromium/net/tools/transport_security_state_generator/input_file_parsers.h @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/transport_security_state_generator/input_file_parsers_unittest.cc b/chromium/net/tools/transport_security_state_generator/input_file_parsers_unittest.cc index 28980fea2f9..47b4aa5d5ab 100644 --- a/chromium/net/tools/transport_security_state_generator/input_file_parsers_unittest.cc +++ b/chromium/net/tools/transport_security_state_generator/input_file_parsers_unittest.cc @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/transport_security_state_generator/pinset.cc b/chromium/net/tools/transport_security_state_generator/pinset.cc index edef5e6efe1..ba0ab5734e9 100644 --- a/chromium/net/tools/transport_security_state_generator/pinset.cc +++ b/chromium/net/tools/transport_security_state_generator/pinset.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/transport_security_state_generator/pinset.h b/chromium/net/tools/transport_security_state_generator/pinset.h index e27eb4b9859..b52ce5e040b 100644 --- a/chromium/net/tools/transport_security_state_generator/pinset.h +++ b/chromium/net/tools/transport_security_state_generator/pinset.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/transport_security_state_generator/pinsets.cc b/chromium/net/tools/transport_security_state_generator/pinsets.cc index d768659788a..f0aa7974d3f 100644 --- a/chromium/net/tools/transport_security_state_generator/pinsets.cc +++ b/chromium/net/tools/transport_security_state_generator/pinsets.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/transport_security_state_generator/pinsets.h b/chromium/net/tools/transport_security_state_generator/pinsets.h index 89e8e15a53d..04c22a50200 100644 --- a/chromium/net/tools/transport_security_state_generator/pinsets.h +++ b/chromium/net/tools/transport_security_state_generator/pinsets.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/transport_security_state_generator/preloaded_state_generator.cc b/chromium/net/tools/transport_security_state_generator/preloaded_state_generator.cc index 4023b18f0a9..73f72c4550c 100644 --- a/chromium/net/tools/transport_security_state_generator/preloaded_state_generator.cc +++ b/chromium/net/tools/transport_security_state_generator/preloaded_state_generator.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/transport_security_state_generator/preloaded_state_generator.h b/chromium/net/tools/transport_security_state_generator/preloaded_state_generator.h index de50e3f29f3..dc5ed17dafe 100644 --- a/chromium/net/tools/transport_security_state_generator/preloaded_state_generator.h +++ b/chromium/net/tools/transport_security_state_generator/preloaded_state_generator.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/transport_security_state_generator/spki_hash.cc b/chromium/net/tools/transport_security_state_generator/spki_hash.cc index 0474671d686..374d2e57300 100644 --- a/chromium/net/tools/transport_security_state_generator/spki_hash.cc +++ b/chromium/net/tools/transport_security_state_generator/spki_hash.cc @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/transport_security_state_generator/spki_hash.h b/chromium/net/tools/transport_security_state_generator/spki_hash.h index 93627b08473..270c30420c5 100644 --- a/chromium/net/tools/transport_security_state_generator/spki_hash.h +++ b/chromium/net/tools/transport_security_state_generator/spki_hash.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/transport_security_state_generator/spki_hash_unittest.cc b/chromium/net/tools/transport_security_state_generator/spki_hash_unittest.cc index 0f46d51d854..f4045ecd153 100644 --- a/chromium/net/tools/transport_security_state_generator/spki_hash_unittest.cc +++ b/chromium/net/tools/transport_security_state_generator/spki_hash_unittest.cc @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/transport_security_state_generator/transport_security_state_entry.cc b/chromium/net/tools/transport_security_state_generator/transport_security_state_entry.cc index 2871b48ca06..36eb8ee081c 100644 --- a/chromium/net/tools/transport_security_state_generator/transport_security_state_entry.cc +++ b/chromium/net/tools/transport_security_state_generator/transport_security_state_entry.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/transport_security_state_generator/transport_security_state_entry.h b/chromium/net/tools/transport_security_state_generator/transport_security_state_entry.h index 0646bb5cb96..db0e0d589a7 100644 --- a/chromium/net/tools/transport_security_state_generator/transport_security_state_entry.h +++ b/chromium/net/tools/transport_security_state_generator/transport_security_state_entry.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/transport_security_state_generator/transport_security_state_generator.cc b/chromium/net/tools/transport_security_state_generator/transport_security_state_generator.cc index d1daa4188b8..c54417be41f 100644 --- a/chromium/net/tools/transport_security_state_generator/transport_security_state_generator.cc +++ b/chromium/net/tools/transport_security_state_generator/transport_security_state_generator.cc @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/truncate_net_log.py b/chromium/net/tools/truncate_net_log.py index 1841b08f788..26137e73e36 100755 --- a/chromium/net/tools/truncate_net_log.py +++ b/chromium/net/tools/truncate_net_log.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2017 The Chromium Authors. All rights reserved. +# Copyright 2017 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/net/tools/update_ios_bundle_data.py b/chromium/net/tools/update_ios_bundle_data.py index e09d9d32ec0..cba1d6bc742 100755 --- a/chromium/net/tools/update_ios_bundle_data.py +++ b/chromium/net/tools/update_ios_bundle_data.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017 The Chromium Authors. All rights reserved. +# Copyright 2017 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. |