diff options
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.h | 53 |
1 files changed, 28 insertions, 25 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 2c319ae38e46..e89e770932ae 100644 --- a/www/chromium/files/patch-components_os__crypt_os__crypt.h +++ b/www/chromium/files/patch-components_os__crypt_os__crypt.h @@ -1,48 +1,51 @@ ---- components/os_crypt/os_crypt.h.orig 2020-11-13 06:36:41 UTC +--- components/os_crypt/os_crypt.h.orig 2021-03-12 23:57:22 UTC +++ components/os_crypt/os_crypt.h -@@ -15,9 +15,9 @@ - #include "base/strings/string16.h" - #include "build/build_config.h" +@@ -18,9 +18,9 @@ --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // 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) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) class KeyStorageLinux; --#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #if defined(OS_WIN) || defined(OS_MAC) class PrefRegistrySimple; -@@ -34,13 +34,13 @@ struct Config; - // true for Linux, if a password management tool is available. - class OSCrypt { +@@ -39,16 +39,16 @@ class OSCrypt { public: --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // 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) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) // Set the configuration of OSCrypt. static COMPONENT_EXPORT(OS_CRYPT) void SetConfig( std::unique_ptr<os_crypt::Config> config); --#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) --#if defined(OS_APPLE) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if defined(OS_APPLE) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. + #if defined(OS_APPLE) || defined(OS_WIN) || \ +- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) // 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 -@@ -131,7 +131,7 @@ class OSCrypt { - DISALLOW_IMPLICIT_CONSTRUCTORS(OSCrypt); - }; +@@ -142,7 +142,7 @@ class OSCrypt { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // 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) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) // 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. -@@ -146,6 +146,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(); --#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #endif // COMPONENTS_OS_CRYPT_OS_CRYPT_H_ |