aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-components_os__crypt_sync_os__crypt.h
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-components_os__crypt_sync_os__crypt.h')
-rw-r--r--www/chromium/files/patch-components_os__crypt_sync_os__crypt.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/www/chromium/files/patch-components_os__crypt_sync_os__crypt.h b/www/chromium/files/patch-components_os__crypt_sync_os__crypt.h
index 57d424286e5c..b71296e7b06e 100644
--- a/www/chromium/files/patch-components_os__crypt_sync_os__crypt.h
+++ b/www/chromium/files/patch-components_os__crypt_sync_os__crypt.h
@@ -1,15 +1,15 @@
---- components/os_crypt/sync/os_crypt.h.orig 2025-04-04 08:52:13 UTC
+--- components/os_crypt/sync/os_crypt.h.orig 2025-07-02 06:08:04 UTC
+++ components/os_crypt/sync/os_crypt.h
-@@ -16,7 +16,7 @@
- #include "build/chromecast_buildflags.h"
- #include "crypto/subtle_passkey.h"
+@@ -22,7 +22,7 @@ class AppleKeychain;
+ }
+ #endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
class KeyStorageLinux;
#endif // BUILDFLAG(IS_LINUX)
-@@ -32,7 +32,7 @@ struct Config;
+@@ -38,7 +38,7 @@ struct Config;
// Temporary interface due to OSCrypt refactor. See OSCryptImpl for descriptions
// of what each function does.
namespace OSCrypt {
@@ -18,7 +18,7 @@
COMPONENT_EXPORT(OS_CRYPT)
void SetConfig(std::unique_ptr<os_crypt::Config> config);
#endif // BUILDFLAG(IS_LINUX)
-@@ -77,7 +77,7 @@ COMPONENT_EXPORT(OS_CRYPT) void UseMockKeyForTesting(b
+@@ -83,7 +83,7 @@ COMPONENT_EXPORT(OS_CRYPT) void UseMockKeyForTesting(b
COMPONENT_EXPORT(OS_CRYPT) void SetLegacyEncryptionForTesting(bool legacy);
COMPONENT_EXPORT(OS_CRYPT) void ResetStateForTesting();
#endif // BUILDFLAG(IS_WIN)
@@ -27,7 +27,7 @@
COMPONENT_EXPORT(OS_CRYPT)
void UseMockKeyStorageForTesting(
base::OnceCallback<std::unique_ptr<KeyStorageLinux>()>
-@@ -111,7 +111,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl {
+@@ -117,7 +117,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl {
// Returns singleton instance of OSCryptImpl.
static OSCryptImpl* GetInstance();
@@ -36,7 +36,7 @@
// Set the configuration of OSCryptImpl.
// This method, or SetRawEncryptionKey(), must be called before using
// EncryptString() and DecryptString().
-@@ -207,7 +207,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl {
+@@ -213,7 +213,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl {
void ResetStateForTesting();
#endif
@@ -45,7 +45,7 @@
// For unit testing purposes, inject methods to be used.
// |storage_provider_factory| provides the desired |KeyStorage|
// implementation. If the provider returns |nullptr|, a hardcoded password
-@@ -231,13 +231,13 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl {
+@@ -240,13 +240,13 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl {
bool DeriveKey();
#endif // BUILDFLAG(IS_APPLE)