Security-57740.60.18.tar.gz

[apple/security.git] / OSX / sec / SOSCircle / SecureObjectSync / SOSPeerInfoV2.c

diff --git a/OSX/sec/SOSCircle/SecureObjectSync/SOSPeerInfoV2.c b/OSX/sec/SOSCircle/SecureObjectSync/SOSPeerInfoV2.c
index ab74681cbb43c9f7f2e0acd89ed40d7ef7d453b3..b4450b97fa8e2622f18c89a554dbfaa95ebca59e 100644 (file)
--- a/OSX/sec/SOSCircle/SecureObjectSync/SOSPeerInfoV2.c
+++ b/OSX/sec/SOSCircle/SecureObjectSync/SOSPeerInfoV2.c
@@ -10,6 +10,7 @@
 #include "SOSPeerInfoV2.h"
 #include <Security/SecureObjectSync/SOSInternal.h>
 #include <Security/SecureObjectSync/SOSAccountPriv.h>
+#include <Security/SecureObjectSync/SOSPeerInfoV2.h>
 #include <utilities/der_plist.h>
 #include <utilities/der_plist_internal.h>
 #include <corecrypto/ccder.h>
@@ -76,6 +77,17 @@ void SOSPeerInfoSetSerialNumber(SOSPeerInfoRef pi) {
     CFReleaseNull(serialNumber);
 }
 
+const CFStringRef SOSSerialUnknown = CFSTR("Unknown");
+
+void SOSPeerInfoSetTestSerialNumber(SOSPeerInfoRef pi, CFStringRef serialNumber) {
+    if(serialNumber) SOSPeerInfoV2DictionarySetValue(pi, sSerialNumberKey, serialNumber);
+}
+
+CFStringRef SOSPeerInfoCopySerialNumber(SOSPeerInfoRef pi) {
+    CFStringRef retval = SOSPeerInfoV2DictionaryCopyString(pi, sSerialNumberKey);
+    return (retval ? retval : CFRetain(SOSSerialUnknown));
+}
+
 static bool SOSPeerInfoV2SanityCheck(SOSPeerInfoRef pi) {
     if(!pi) {
         return false;
@@ -88,7 +100,7 @@ static bool SOSPeerInfoV2SanityCheck(SOSPeerInfoRef pi) {
 
 static CFDataRef SOSPeerInfoGetV2Data(SOSPeerInfoRef pi) {
     if(SOSPeerInfoV2SanityCheck(pi) == false) return NULL;
-    return CFDictionaryGetValue(pi->description, sV2DictionaryKey);
+    return asData(CFDictionaryGetValue(pi->description, sV2DictionaryKey), NULL);
 }
 
 static CFMutableDictionaryRef SOSCreateDictionaryFromDER(CFDataRef v2Data, CFErrorRef *error) {
@@ -149,36 +161,27 @@ bool SOSPeerInfoUpdateToV2(SOSPeerInfoRef pi, CFErrorRef *error) {
     
     SOSPeerInfoSetVersionNumber(pi, PEERINFO_CURRENT_VERSION);
     CFMutableDictionaryRef v2Dictionary = CFDictionaryCreateMutable(NULL, 2, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
-    CFStringRef serialNumber = SOSCopySerialNumberAsString(error);
-    if(serialNumber == NULL) {
-        secnotice("signing", "serialNumber was returned NULL\n");
-    }
-    CFMutableSetRef views = SOSViewsCreateDefault(false, error);
+    CFMutableSetRef views = SOSViewCopyViewSet(kViewSetDefault);
     CFMutableSetRef secproperties = CFSetCreateMutable(NULL, 0, &kCFTypeSetCallBacks);
-    if(serialNumber) CFDictionaryAddValue(v2Dictionary, sSerialNumberKey, serialNumber);
     CFDictionaryAddValue(v2Dictionary, sViewsKey, views);
     CFDictionaryAddValue(v2Dictionary, sSecurityPropertiesKey, secproperties);
-   
-    if (whichTransportType == kSOSTransportFuture || whichTransportType == kSOSTransportIDS){
-        CFDictionaryAddValue(v2Dictionary, sDeviceID, CFSTR(""));
-        CFDictionaryAddValue(v2Dictionary, sTransportType, SOSTransportMessageTypeIDS);
-        CFDictionaryAddValue(v2Dictionary, sPreferIDS, kCFBooleanTrue);
-    }
-    else{
-        CFDictionaryAddValue(v2Dictionary, sDeviceID, CFSTR(""));
-        CFDictionaryAddValue(v2Dictionary, sTransportType, SOSTransportMessageTypeKVS);
-        CFDictionaryAddValue(v2Dictionary, sPreferIDS, kCFBooleanTrue);
-    }
+    
+    CFDictionaryAddValue(v2Dictionary, sDeviceID, CFSTR(""));
+    CFDictionaryAddValue(v2Dictionary, sTransportType, SOSTransportMessageTypeIDSV2);
+    CFDictionaryAddValue(v2Dictionary, sPreferIDS, kCFBooleanFalse);
+    CFDictionaryAddValue(v2Dictionary, sPreferIDSFragmentation, kCFBooleanTrue);
+    CFDictionaryAddValue(v2Dictionary, sPreferIDSACKModel, kCFBooleanTrue);
+    
     require_action_quiet((v2data = SOSCreateDERFromDictionary(v2Dictionary, error)), out, SOSCreateError(kSOSErrorAllocationFailure, CFSTR("No Memory"), NULL, error));
     CFDictionaryAddValue(pi->description, sV2DictionaryKey, v2data);
-    //SOSPeerInfoExpandV2Data(pi, error);
+    // To use the central serial number setting routine this must be done after the V2 dictionary is installed.
+    SOSPeerInfoSetSerialNumber(pi);
+    SOSPeerInfoExpandV2Data(pi, error);
     retval = true;
 out:
     CFReleaseNull(views);
-    CFReleaseNull(secproperties);
     CFReleaseNull(v2data);
     CFReleaseNull(v2Dictionary);
-    CFReleaseNull(serialNumber);
     return retval;
 }
 
@@ -194,15 +197,18 @@ errOut:
 
 bool SOSPeerInfoExpandV2Data(SOSPeerInfoRef pi, CFErrorRef *error) {
     CFDataRef v2data = NULL;
-    bool retval = false;
+    CFMutableDictionaryRef v2Dictionary = NULL;
 
-    require_quiet(pi, out);
-    CFReleaseNull(pi->v2Dictionary);
     require_action_quiet((v2data = SOSPeerInfoGetV2Data(pi)), out, SOSCreateError(kSOSErrorDecodeFailure, CFSTR("No V2 Data in description"), NULL, error));
-    require_action_quiet((pi->v2Dictionary = SOSCreateDictionaryFromDER(v2data, error)), out, SOSCreateError(kSOSErrorDecodeFailure, CFSTR("Can't expand V2 Dictionary"), NULL, error));
-    retval = true;
+    require_action_quiet((v2Dictionary = SOSCreateDictionaryFromDER(v2data, error)), out, SOSCreateError(kSOSErrorDecodeFailure, CFSTR("Can't expand V2 Dictionary"), NULL, error));
+    CFReleaseNull(pi->v2Dictionary);
+    pi->v2Dictionary = v2Dictionary;
+    return true;
+
 out:
-    return retval;
+    CFReleaseNull(v2Dictionary);
+    return false;
+
 }
 
 void SOSPeerInfoV2DictionarySetValue(SOSPeerInfoRef pi, const void *key, const void *value) {
@@ -233,14 +239,22 @@ errOut:
     return false;
 }
 
-
-bool SOSPeerInfoV2DictionaryHasString(SOSPeerInfoRef pi, const void *key) {
+// Not API to prevent owenership confusion
+static CFStringRef SOSPeerInfoV2DictionaryGetAsString(SOSPeerInfoRef pi, const void *key) {
     require_quiet(SOSPeerInfoExpandV2Data(pi, NULL), errOut);
-    CFTypeRef value = CFDictionaryGetValue(pi->v2Dictionary, key);
-    if(asString(value,NULL) != NULL)
-        return true;
+    return asString(CFDictionaryGetValue(pi->v2Dictionary, key), NULL);
 errOut:
-    return false;
+    return NULL;
+
+}
+
+bool SOSPeerInfoV2DictionaryHasStringValue(SOSPeerInfoRef pi, const void *key, CFStringRef value) {
+    return CFEqualSafe(SOSPeerInfoV2DictionaryGetAsString(pi, key), value);
+}
+
+bool SOSPeerInfoV2DictionaryHasString(SOSPeerInfoRef pi, const void *key) {
+    CFStringRef possibleID = SOSPeerInfoV2DictionaryGetAsString(pi, key);
+    return possibleID != NULL && CFStringGetLength(possibleID) > 0;
 }
 
 bool SOSPeerInfoV2DictionaryHasSet(SOSPeerInfoRef pi, const void *key) {
@@ -261,7 +275,7 @@ errOut:
     return false;
 }
 
-const CFMutableStringRef SOSPeerInfoV2DictionaryCopyString(SOSPeerInfoRef pi, const void *key) {
+CFMutableStringRef SOSPeerInfoV2DictionaryCopyString(SOSPeerInfoRef pi, const void *key) {
     require_quiet(SOSPeerInfoExpandV2Data(pi, NULL), errOut);
     CFStringRef value = asString(CFDictionaryGetValue(pi->v2Dictionary, key), NULL);
     if(value != NULL)
@@ -288,7 +302,7 @@ void SOSPeerInfoV2DictionaryWithSet(SOSPeerInfoRef pi, const void *key, void(^op
     });
 }
 
-const CFMutableSetRef SOSPeerInfoV2DictionaryCopySet(SOSPeerInfoRef pi, const void *key) {
+CFMutableSetRef SOSPeerInfoV2DictionaryCopySet(SOSPeerInfoRef pi, const void *key) {
     require_quiet(SOSPeerInfoExpandV2Data(pi, NULL), errOut);
     CFSetRef value = asSet(CFDictionaryGetValue(pi->v2Dictionary, key), NULL);
     if(value != NULL)
@@ -316,7 +330,7 @@ errOut:
     return value && CFSetContainsValue(value, member);
 }
 
-const CFMutableDataRef SOSPeerInfoV2DictionaryCopyData(SOSPeerInfoRef pi, const void *key) {
+CFMutableDataRef SOSPeerInfoV2DictionaryCopyData(SOSPeerInfoRef pi, const void *key) {
     require_quiet(SOSPeerInfoExpandV2Data(pi, NULL), errOut);
     CFDataRef value = asData(CFDictionaryGetValue(pi->v2Dictionary, key), NULL);
     if(value != NULL)
@@ -325,7 +339,7 @@ errOut:
     return NULL;
 }
 
-const CFBooleanRef SOSPeerInfoV2DictionaryCopyBoolean(SOSPeerInfoRef pi, const void *key) {
+CFBooleanRef SOSPeerInfoV2DictionaryCopyBoolean(SOSPeerInfoRef pi, const void *key) {
     require_quiet(SOSPeerInfoExpandV2Data(pi, NULL), errOut);
     CFBooleanRef value = asBoolean(CFDictionaryGetValue(pi->v2Dictionary, key), NULL);
     if(value != NULL)
@@ -334,7 +348,7 @@ errOut:
     return NULL;
 }
 
-const CFMutableDictionaryRef SOSPeerInfoV2DictionaryCopyDictionary(SOSPeerInfoRef pi, const void *key) {
+CFMutableDictionaryRef SOSPeerInfoV2DictionaryCopyDictionary(SOSPeerInfoRef pi, const void *key) {
     require_quiet(SOSPeerInfoExpandV2Data(pi, NULL), errOut);
     CFDictionaryRef value = asDictionary(CFDictionaryGetValue(pi->v2Dictionary, key), NULL);
     if(value != NULL)
@@ -342,3 +356,17 @@ const CFMutableDictionaryRef SOSPeerInfoV2DictionaryCopyDictionary(SOSPeerInfoRe
 errOut:
     return NULL;
 }
+
+
+SOSPeerInfoRef SOSPeerInfoCopyWithV2DictionaryUpdate(CFAllocatorRef allocator, SOSPeerInfoRef toCopy, CFDictionaryRef newv2dict, SecKeyRef signingKey, CFErrorRef* error) {
+    SOSPeerInfoRef retval = SOSPeerInfoCreateCopy(kCFAllocatorDefault, toCopy, error);
+    require_quiet(retval, errOut);
+    require_action_quiet(SOSPeerInfoExpandV2Data(retval, error), errOut, CFReleaseNull(retval));
+    CFDictionaryForEach(newv2dict, ^(const void *key, const void *value) {
+        CFDictionarySetValue(retval->v2Dictionary, key, value);
+    });
+    SOSPeerInfoPackV2Data(retval);
+    require_action_quiet(SOSPeerInfoSign(signingKey, retval, error), errOut, CFReleaseNull(retval));
+errOut:
+    return retval;
+}