Merge branch 'fork'

codelathe · Aug 14, 2024 · 0d5aedd · 0d5aedd
2 parents e0c7eeb + 49d5cbd
commit 0d5aedd
Showing 1 changed file with 22 additions and 1 deletion.
diff --git a/Lib/KeychainAccess/Keychain.swift b/Lib/KeychainAccess/Keychain.swift
@@ -881,12 +881,18 @@ public final class Keychain {
 
     // MARK:
 
-    public class func allKeys(_ itemClass: ItemClass) -> [(String, String)] {
+    public class func allKeys(_ itemClass: ItemClass, accessGroupsCompatible: Bool = true) -> [(String, String)] {
         var query = [String: Any]()
         query[Class] = itemClass.rawValue
         query[AttributeSynchronizable] = SynchronizableAny
         query[MatchLimit] = MatchLimitAll
         query[ReturnAttributes] = kCFBooleanTrue
+
+        if #available(iOS 13.0, OSX 10.15, watchOS 6.0, tvOS 13.0, *) {
+            if accessGroupsCompatible {
+                query[UseDataProtectionKeychain] = true
+            }
+        }
 
         var result: AnyObject?
         let status = SecItemCopyMatching(query as CFDictionary, &result)
@@ -1293,6 +1299,9 @@ private let UseAuthenticationUIFail = String(kSecUseAuthenticationUIFail)
 @available(iOS 9.0, macOS 10.11, watchOS 2.0, tvOS 9.0, *)
 private let UseAuthenticationUISkip = String(kSecUseAuthenticationUISkip)
 
+@available(iOS 13.0, OSX 10.15, watchOS 6.0, tvOS 13.0, *)
+private let UseDataProtectionKeychain = String(kSecUseDataProtectionKeychain)
+
 #if os(iOS) && !targetEnvironment(macCatalyst)
 /** Credential Key Constants */
 private let SharedPassword = String(kSecSharedPassword)
@@ -1355,6 +1364,12 @@ extension Options {
             }
         }
         #endif
+
+        if #available(iOS 13.0, OSX 10.15, watchOS 6.0, tvOS 13.0, *) {
+//            if accessGroup != nil {
+                query[UseDataProtectionKeychain] = true
+//            }
+        }
 
         return query
     }
@@ -1397,6 +1412,12 @@ extension Options {
         }
 
         attributes[AttributeSynchronizable] = synchronizable ? kCFBooleanTrue : kCFBooleanFalse
+
+        if #available(iOS 13.0, OSX 10.15, watchOS 6.0, tvOS 13.0, *) {
+//            if accessGroup != nil {
+                attributes[UseDataProtectionKeychain] = true
+//            }
+        }
 
         return (attributes, nil)
     }