From 8805a46bd7441113c6e2df03dd581de1f34ad079 Mon Sep 17 00:00:00 2001 From: Max Karolinskiy <41635752+mkarolin@users.noreply.github.com> Date: Tue, 9 Jan 2024 23:57:33 -0500 Subject: [PATCH] Upgrade from Chromium 120.0.6099.199 to Chromium 120.0.6099.217 (1.62.x). (#21532) * Upgrade from Chromium 120.0.6099.199 to Chromium 120.0.6099.217 * Update pins list timestamp --------- Co-authored-by: brave-builds --- .../transport_security_state_generator/input_file_parsers.cc | 4 ++-- package.json | 2 +- patches/components-crx_file-crx_verifier.cc.patch | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc index 6259c2b04bc3..9dbe8df2ef32 100644 --- a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc +++ b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc @@ -549,9 +549,9 @@ bool ParseCertificatesFile(std::string_view certs_input, Pinsets* pinsets, base::Time* timestamp) { constexpr std::string_view brave_certs = R"brave_certs( -# Last updated: Wed Jan 3 19:49:43 UTC 2024 +# Last updated: Wed Jan 10 01:12:59 UTC 2024 PinsListTimestamp -1704311383 +1704849179 # =====BEGIN BRAVE ROOTS ASC===== #From https://www.amazontrust.com/repository/ diff --git a/package.json b/package.json index 708a0a988622..7a1620e531d5 100644 --- a/package.json +++ b/package.json @@ -268,7 +268,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "120.0.6099.199", + "tag": "120.0.6099.217", "repository": { "url": "https://github.com/brave/chromium" } diff --git a/patches/components-crx_file-crx_verifier.cc.patch b/patches/components-crx_file-crx_verifier.cc.patch index aa60ab7cac6f..3c2cc983f678 100644 --- a/patches/components-crx_file-crx_verifier.cc.patch +++ b/patches/components-crx_file-crx_verifier.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/crx_file/crx_verifier.cc b/components/crx_file/crx_verifier.cc -index 2378aa5a95159926c798281080f4e02a158c616a..e6df055145b916459f02e8b9204649fede4a8b47 100644 +index cf038c50bdbe4167d446cc6bea6adbb8ae8c1894..73465d7892ec4abca564dd184c51dc0427ddfbe1 100644 --- a/components/crx_file/crx_verifier.cc +++ b/components/crx_file/crx_verifier.cc -@@ -181,6 +181,7 @@ VerifierResult VerifyCrx3( +@@ -197,6 +197,7 @@ VerifierResult VerifyCrx3( found_publisher_key = found_publisher_key || key_hash == publisher_key || (accept_publisher_test_key && key_hash == *publisher_test_key);