summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-components_os__crypt_os__crypt.h
diff options
context:
space:
mode:
authorMatthias Wolf <freebsd@rheinwolf.de>2022-02-01 18:38:49 +0100
committerRene Ladan <rene@FreeBSD.org>2022-02-01 18:45:40 +0100
commitaa70a996eae7376396a5dd8a9e5105bebb6bc72c (patch)
treeee91e0564101803a57091d4df8e4f3892eb8d0fc /www/chromium/files/patch-components_os__crypt_os__crypt.h
parentwww/firefox-esr: update to 91.6.0 (rc1) (diff)
www/chromium: update to 97.0.4692.99
Note that the port is currently broken on i386 as it does not compile there. Security: https://vuxml.freebsd.org/freebsd/51496cbc-7a0e-11ec-a323-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/9eeccbf3-6e26-11ec-bb10-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/fb9ba490-5cc4-11ec-aac7-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/18ac074c-579f-11ec-aac7-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/b8c0cbca-472d-11ec-83dc-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/976d7bf9-38ea-11ec-b3b0-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/bdaecfad-3117-11ec-b3b0-3065ec8fd3ec.html
Diffstat (limited to 'www/chromium/files/patch-components_os__crypt_os__crypt.h')
-rw-r--r--www/chromium/files/patch-components_os__crypt_os__crypt.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/www/chromium/files/patch-components_os__crypt_os__crypt.h b/www/chromium/files/patch-components_os__crypt_os__crypt.h
index 9280628e7a8a..d50931d7c7c3 100644
--- a/www/chromium/files/patch-components_os__crypt_os__crypt.h
+++ b/www/chromium/files/patch-components_os__crypt_os__crypt.h
@@ -1,4 +1,4 @@
---- components/os_crypt/os_crypt.h.orig 2021-05-12 22:05:50 UTC
+--- components/os_crypt/os_crypt.h.orig 2021-12-14 11:45:03 UTC
+++ components/os_crypt/os_crypt.h
@@ -17,9 +17,9 @@
@@ -12,8 +12,8 @@
#if defined(OS_WIN) || defined(OS_MAC)
class PrefRegistrySimple;
-@@ -38,16 +38,16 @@ class OSCrypt {
- public:
+@@ -42,16 +42,16 @@ class OSCrypt {
+
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -32,7 +32,7 @@
// On Linux returns true iff the real secret key (not hardcoded one) is
// available. On MacOS returns true if Keychain is available (for mock
// Keychain it returns true if not using locked Keychain, false if using
-@@ -141,7 +141,7 @@ class OSCrypt {
+@@ -142,7 +142,7 @@ class OSCrypt {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -41,7 +41,7 @@
// For unit testing purposes, inject methods to be used.
// |get_key_storage_mock| provides the desired |KeyStorage| implementation.
// If the provider returns |nullptr|, a hardcoded password will be used.
-@@ -156,6 +156,6 @@ void UseMockKeyStorageForTesting(
+@@ -157,6 +157,6 @@ void UseMockKeyStorageForTesting(
// Clears any caching and most lazy initialisations performed by the production
// code. Should be used after any test which required a password.
COMPONENT_EXPORT(OS_CRYPT) void ClearCacheForTesting();