Security-58286.260.20.tar.gz

[apple/security.git] / keychain / ckks / CKKSViewManager.h

diff --git a/keychain/ckks/CKKSViewManager.h b/keychain/ckks/CKKSViewManager.h
index 06f24aa7a712586d766aa2f924406fdadcbe9847..7a63416eacddca0c038957c49b461bd2b6af68cf 100644 (file)
--- a/keychain/ckks/CKKSViewManager.h
+++ b/keychain/ckks/CKKSViewManager.h
@@ -33,10 +33,13 @@
 #import "keychain/ckks/CKKSCondition.h"
 #import "keychain/ckks/CKKSControlProtocol.h"
 #import "keychain/ckks/CKKSLockStateTracker.h"
+#import "keychain/ckks/CKKSReachabilityTracker.h"
 #import "keychain/ckks/CKKSNotifier.h"
 #import "keychain/ckks/CKKSPeer.h"
 #import "keychain/ckks/CKKSRateLimiter.h"
 #import "keychain/ckks/CloudKitDependencies.h"
+#import "keychain/ckks/CKKSZoneChangeFetcher.h"
+#import "keychain/ot/OTDefines.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -47,6 +50,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property CKContainer* container;
 @property CKKSCKAccountStateTracker* accountTracker;
 @property CKKSLockStateTracker* lockStateTracker;
+@property CKKSReachabilityTracker *reachabilityTracker;
+@property CKKSZoneChangeFetcher* zoneChangeFetcher;
 @property bool initializeNewZones;
 
 // Signaled when SecCKKSInitialize is complete, as it's async and likes to fire after tests are complete
@@ -68,7 +73,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (CKKSKeychainView*)findView:(NSString*)viewName;
 - (CKKSKeychainView*)findOrCreateView:(NSString*)viewName;
-+ (CKKSKeychainView*)findOrCreateView:(NSString*)viewName;
 - (void)setView:(CKKSKeychainView*)obj;
 - (void)clearView:(NSString*)viewName;
 
@@ -84,12 +88,12 @@ NS_ASSUME_NONNULL_BEGIN
                                   added:(SecDbItemRef _Nullable)added
                                 deleted:(SecDbItemRef _Nullable)deleted;
 
-- (void)setCurrentItemForAccessGroup:(SecDbItemRef)newItem
+- (void)setCurrentItemForAccessGroup:(NSData* _Nonnull)newItemPersistentRef
                                 hash:(NSData*)newItemSHA1
                          accessGroup:(NSString*)accessGroup
                           identifier:(NSString*)identifier
                             viewHint:(NSString*)viewHint
-                           replacing:(SecDbItemRef _Nullable)oldItem
+                           replacing:(NSData* _Nullable)oldCurrentItemPersistentRef
                                 hash:(NSData* _Nullable)oldItemSHA1
                             complete:(void (^)(NSError* operror))complete;
 
@@ -113,9 +117,6 @@ NS_ASSUME_NONNULL_BEGIN
 // Called by XPC every 24 hours
 - (void)xpc24HrNotification;
 
-/* Interface to CCKS control channel */
-- (xpc_endpoint_t)xpcControlEndpoint;
-
 /* White-box testing only */
 - (CKKSKeychainView*)restartZone:(NSString*)viewName;
 
@@ -130,6 +131,11 @@ NS_ASSUME_NONNULL_BEGIN
 - (CKKSSelves* _Nullable)fetchSelfPeers:(NSError* __autoreleasing*)error;
 - (NSSet<id<CKKSPeer>>* _Nullable)fetchTrustedPeers:(NSError* __autoreleasing*)error;
 
+// For mocking purposes
+- (id<CKKSSelfPeer> _Nullable)currentSOSSelf:(NSError**)error;
+- (NSSet<id<CKKSSelfPeer>>*)pastSelves:(NSError**)error;
+- (NSArray<NSDictionary*>* _Nullable)loadRestoredBottledKeysOfType:(OctagonKeyType)keyType error:(NSError**)error;
+
 - (void)sendSelfPeerChangedUpdate;
 - (void)sendTrustedPeerSetChangedUpdate;