View | Details | Raw Unified | Return to bug 273376 | Differences between
and this patch

Collapse All | Expand All

(-)b/www/chromium/files/patch-components_password__manager_core_browser_ui_passwords__grouper.cc (-16 / +9 lines)
Lines 1-21 Link Here
1 
--- components/password_manager/core/browser/ui/passwords_grouper.cc.orig	2023-08-17 12:40:56 UTC
 1 
--- components/password_manager/core/browser/ui/passwords_grouper.cc.orig	2023-08-28 12:53:33 UTC
2 
+++ components/password_manager/core/browser/ui/passwords_grouper.cc
 2 
+++ components/password_manager/core/browser/ui/passwords_grouper.cc
3 
@@ -399,6 +399,7 @@ absl::optional<PasskeyCredential> PasswordsGrouper::Ge
 3 
@@ -403,7 +403,11 @@ absl::optional<PasskeyCredential> PasswordsGrouper::Ge
4 
   if (group_id_iterator == map_signon_realm_to_group_id_.end()) {
5 
     return absl::nullopt;
6 
   }
7 
+#if BUILDFLAG(IS_OPENBSD) || (BUILDFLAG(IS_FREEBSD) && (_LIBCPP_VERSION > 15000))
8 
   // Find the passkey in the group.
9 
   const std::vector<PasskeyCredential>& passkeys =
 4 
   const std::vector<PasskeyCredential>& passkeys =
10 
       map_group_id_to_credentials_[group_id_iterator->second].passkeys;
 5 
       map_group_id_to_credentials_[group_id_iterator->second].passkeys;
11 
@@ -410,6 +411,10 @@ absl::optional<PasskeyCredential> PasswordsGrouper::Ge
 6 
   const auto passkey_it =
12 
     return absl::nullopt;
 7 
+#if (_LIBCPP_VERSION >= 160000)
13 
   }
 8 
       std::ranges::find_if(passkeys, [&credential](const auto& passkey) {
14 
   return *passkey_it;
15 
+#else
 9 
+#else
16 
+  LOG(ERROR) << "Unable to lookup in password group";
 10 
+      base::ranges::find_if(passkeys, [&credential](const auto& passkey) {
17 
+  return absl::nullopt;
18 
+#endif
 11 
+#endif
19 
 }
 12 
         return credential.passkey_credential_id == passkey.credential_id();
20
13 
       });
21 
 void PasswordsGrouper::ClearCache() {
 14 
   if (passkey_it == passkeys.end()) {
(-)b/www/chromium/files/patch-components_webauthn_core_browser_passkey__sync__bridge.cc (-26 / +13 lines)
Lines 1-38 Link Here
1 
--- components/webauthn/core/browser/passkey_sync_bridge.cc.orig	2023-08-17 12:40:56 UTC
 1 
--- components/webauthn/core/browser/passkey_sync_bridge.cc.orig	2023-08-28 12:53:33 UTC
2 
+++ components/webauthn/core/browser/passkey_sync_bridge.cc
 2 
+++ components/webauthn/core/browser/passkey_sync_bridge.cc
3 
@@ -267,6 +267,7 @@ PasskeySyncBridge::GetAllPasskeys() const {
 3 
@@ -268,7 +268,11 @@ PasskeySyncBridge::GetAllPasskeys() const {
4
5 
 bool PasskeySyncBridge::DeletePasskey(const std::string& credential_id) {
 4 
 bool PasskeySyncBridge::DeletePasskey(const std::string& credential_id) {
6 
   // Find the credential with the given |credential_id|.
 5 
   // Find the credential with the given |credential_id|.
7 
+#if BUILDFLAG(IS_OPENBSD) || (BUILDFLAG(IS_FREEBSD) && (_LIBCPP_VERSION > 15000))
8 
   const auto passkey_it =
 6 
   const auto passkey_it =
7 
+#if (_LIBCPP_VERSION >= 160000)
9 
       std::ranges::find_if(data_, [&credential_id](const auto& passkey) {
 8 
       std::ranges::find_if(data_, [&credential_id](const auto& passkey) {
10 
         return passkey.second.credential_id() == credential_id;
11 
@@ -313,11 +314,16 @@ bool PasskeySyncBridge::DeletePasskey(const std::strin
12 
                      weak_ptr_factory_.GetWeakPtr()));
13 
   NotifyPasskeysChanged();
14 
   return true;
15 
+#else
 9 
+#else
16 
+  LOG(ERROR) << "Unable to delete passkey";
10 
+      base::ranges::find_if(data_, [&credential_id](const auto& passkey) {
17 
+  return false;
18 
+#endif
 11 
+#endif
19 
 }
 12 
         return passkey.second.credential_id() == credential_id;
20
13 
       });
21 
 bool PasskeySyncBridge::UpdatePasskey(const std::string& credential_id,
 14 
   if (passkey_it == data_.end()) {
15 
@@ -319,7 +323,11 @@ bool PasskeySyncBridge::UpdatePasskey(const std::strin
22 
                                       PasskeyChange change) {
 16 
                                       PasskeyChange change) {
23 
   // Find the credential with the given |credential_id|.
 17 
   // Find the credential with the given |credential_id|.
24 
+#if BUILDFLAG(IS_OPENBSD) || (BUILDFLAG(IS_FREEBSD) && (_LIBCPP_VERSION > 15000))
25 
   const auto passkey_it =
 18 
   const auto passkey_it =
19 
+#if (_LIBCPP_VERSION >= 160000)
26 
       std::ranges::find_if(data_, [&credential_id](const auto& passkey) {
 20 
       std::ranges::find_if(data_, [&credential_id](const auto& passkey) {
27 
         return passkey.second.credential_id() == credential_id;
28 
@@ -341,6 +347,10 @@ bool PasskeySyncBridge::UpdatePasskey(const std::strin
29 
                      weak_ptr_factory_.GetWeakPtr()));
30 
   NotifyPasskeysChanged();
31 
   return true;
32 
+#else
 21 
+#else
33 
+  LOG(ERROR) << "Unable to update passkey";
22 
+      base::ranges::find_if(data_, [&credential_id](const auto& passkey) {
34 
+  return false;
35 
+#endif
 23 
+#endif
36 
 }
 24 
         return passkey.second.credential_id() == credential_id;
37
25 
       });
38 
 std::string PasskeySyncBridge::AddNewPasskeyForTesting(
 26 
   if (passkey_it == data_.end()) {
39 
-

Return to bug 273376