Security-58286.1.32.tar.gz

[apple/security.git] / OSX / sec / SOSCircle / SecureObjectSync / SOSKVSKeys.h

diff --git a/OSX/sec/SOSCircle/SecureObjectSync/SOSKVSKeys.h b/OSX/sec/SOSCircle/SecureObjectSync/SOSKVSKeys.h
index 35b6f3afc28c18f8897e48ba7231c5a80c969bb7..7dd569446e749134bd8b24749ab82f692be780b9 100644 (file)
--- a/OSX/sec/SOSCircle/SecureObjectSync/SOSKVSKeys.h
+++ b/OSX/sec/SOSCircle/SecureObjectSync/SOSKVSKeys.h
@@ -4,9 +4,8 @@
 #define SOSKVSKEYS_H
 
 #include "SOSCircle.h"
 #define SOSKVSKEYS_H
 
 #include "SOSCircle.h"

-#include <Security/SecureObjectSync/SOSTransportMessage.h>

 #include <Security/SecureObjectSync/SOSTransportMessageKVS.h>
 #include <Security/SecureObjectSync/SOSTransportMessageKVS.h>

-
+#include <Security/SecureObjectSync/SOSAccountPriv.h>

 //
 // MARK: Key formation
 //
 //
 // MARK: Key formation
 //


@@ -20,9 +19,9 @@ typedef enum {
     kAccountChangedKey,
     kDebugInfoKey,
     kRingKey,
     kAccountChangedKey,
     kDebugInfoKey,
     kRingKey,

-    kPeerInfoKey,

     kLastCircleKey,
     kLastKeyParameterKey,
     kLastCircleKey,
     kLastKeyParameterKey,

+    kOTRConfig,

     kUnknownKey,
 } SOSKVSKeyType;
 
     kUnknownKey,
 } SOSKVSKeyType;
 


@@ -31,13 +30,12 @@ extern const CFStringRef kSOSKVSInitialSyncKey;
 extern const CFStringRef kSOSKVSAccountChangedKey;
 extern const CFStringRef kSOSKVSRequiredKey;
 extern const CFStringRef kSOSKVSOfficialDSIDKey;
 extern const CFStringRef kSOSKVSAccountChangedKey;
 extern const CFStringRef kSOSKVSRequiredKey;
 extern const CFStringRef kSOSKVSOfficialDSIDKey;

-
-//extern const CFStringRef kSOSKVSDebugInfo;
+extern const CFStringRef kSOSKVSLastCleanupTimestampKey;
+extern const CFStringRef kSOSKVSOTRConfigVersion;
+extern const CFStringRef kSOSKVSWroteLastKeyParams;

 
 extern const CFStringRef sCirclePrefix;
 extern const CFStringRef sRetirementPrefix;
 
 extern const CFStringRef sCirclePrefix;
 extern const CFStringRef sRetirementPrefix;

-extern const CFStringRef sLastCirclePushedPrefix;
-extern const CFStringRef sLastKeyParametersPushedPrefix;

 extern const CFStringRef sDebugInfoPrefix;
 
 SOSKVSKeyType SOSKVSKeyGetKeyType(CFStringRef key);
 extern const CFStringRef sDebugInfoPrefix;
 
 SOSKVSKeyType SOSKVSKeyGetKeyType(CFStringRef key);


@@ -45,7 +43,6 @@ bool SOSKVSKeyParse(SOSKVSKeyType keyType, CFStringRef key, CFStringRef *circle,
 SOSKVSKeyType SOSKVSKeyGetKeyTypeAndParse(CFStringRef key, CFStringRef *circle, CFStringRef *peerInfo, CFStringRef *ring, CFStringRef *backupName, CFStringRef *from, CFStringRef *to);
 
 CFStringRef SOSCircleKeyCreateWithCircle(SOSCircleRef circle, CFErrorRef *error);
 SOSKVSKeyType SOSKVSKeyGetKeyTypeAndParse(CFStringRef key, CFStringRef *circle, CFStringRef *peerInfo, CFStringRef *ring, CFStringRef *backupName, CFStringRef *from, CFStringRef *to);
 
 CFStringRef SOSCircleKeyCreateWithCircle(SOSCircleRef circle, CFErrorRef *error);

-CFStringRef SOSPeerInfoKeyCreateWithName(CFStringRef peer_info_name, CFErrorRef *error);

 CFStringRef SOSRingKeyCreateWithName(CFStringRef ring_name, CFErrorRef *error);
 
 
 CFStringRef SOSRingKeyCreateWithName(CFStringRef ring_name, CFErrorRef *error);
 
 


@@ -61,16 +58,13 @@ CFStringRef SOSMessageKeyCreateWithCircleAndPeerInfos(SOSCircleRef circle, SOSPe
 CFStringRef SOSRetirementKeyCreateWithCircleNameAndPeer(CFStringRef circle_name, CFStringRef retirement_peer_name);
 CFStringRef SOSRetirementKeyCreateWithCircleAndPeer(SOSCircleRef circle, CFStringRef retirement_peer_name);
 
 CFStringRef SOSRetirementKeyCreateWithCircleNameAndPeer(CFStringRef circle_name, CFStringRef retirement_peer_name);
 CFStringRef SOSRetirementKeyCreateWithCircleAndPeer(SOSCircleRef circle, CFStringRef retirement_peer_name);
 

-CFStringRef SOSMessageKeyCreateFromTransportToPeer(SOSTransportMessageRef transport, CFStringRef peer_name);
-CFStringRef SOSMessageKeyCreateFromPeerToTransport(SOSTransportMessageRef transport, CFStringRef peer_name);
+CFStringRef SOSMessageKeyCreateFromTransportToPeer(SOSMessage* transport, CFStringRef myID, CFStringRef peer_name);
+CFStringRef SOSMessageKeyCreateFromPeerToTransport(SOSMessage* transport, CFStringRef myID, CFStringRef peer_name);
+CFStringRef SOSLastKeyParametersPushedKeyCreateWithAccountGestalt(SOSAccount* account);

 CFStringRef SOSMessageKeyCreateWithCircleNameAndTransportType(CFStringRef circleName, CFStringRef transportType);
 
 CFStringRef SOSMessageKeyCreateWithCircleNameAndTransportType(CFStringRef circleName, CFStringRef transportType);
 

-CFStringRef SOSPeerInfoV2KeyCreateWithPeerName(CFStringRef peer_name);

 CFStringRef SOSRingKeyCreateWithRingName(CFStringRef ring_name);
 CFStringRef SOSRingKeyCreateWithRingName(CFStringRef ring_name);

-CFStringRef SOSLastCirclePushedKeyCreateWithCircleNameAndPeerID(CFStringRef circleName, CFStringRef peerID);
-CFStringRef SOSLastCirclePushedKeyCreateWithAccountGestalt(SOSAccountRef account);

 CFStringRef SOSLastKeyParametersPushedKeyCreateWithPeerID(CFStringRef peerID);
 CFStringRef SOSLastKeyParametersPushedKeyCreateWithPeerID(CFStringRef peerID);

-CFStringRef SOSLastKeyParametersPushedKeyCreateWithAccountGestalt(SOSAccountRef account);

 CFStringRef SOSDebugInfoKeyCreateWithTypeName(CFStringRef type_name);
 
 #endif
 CFStringRef SOSDebugInfoKeyCreateWithTypeName(CFStringRef type_name);
 
 #endif