]> git.saurik.com Git - apple/security.git/blobdiff - Security.xcodeproj/project.pbxproj
Security-58286.70.7.tar.gz
[apple/security.git] / Security.xcodeproj / project.pbxproj
index 1f22215a3cd7c60e4d18f01c8b332f0f271e5ac3..3e7f0bacdfe8ee4fbfba256eeb2ef5c47ca117ea 100644 (file)
@@ -36,6 +36,7 @@
                        buildPhases = (
                        );
                        dependencies = (
+                               0C78CCE51FCC97E7008B4B24 /* PBXTargetDependency */,
                                F621D0831ED6ED5B000EA569 /* PBXTargetDependency */,
                                6C24EF4A1E415109000DE79F /* PBXTargetDependency */,
                                EB27FF261E40716D00EC9E3A /* PBXTargetDependency */,
                                DCB515D91ED3CC6B001F1152 /* PBXTargetDependency */,
                                6C24EF4A1E415109000DE79F /* PBXTargetDependency */,
                                DCB515D71ED3CC52001F1152 /* PBXTargetDependency */,
+                               6CAA8D3F1F8431C9007B6E03 /* PBXTargetDependency */,
+                               6CAA8CE91F82FD13007B6E03 /* PBXTargetDependency */,
                                DC5225001E40295C0021640A /* PBXTargetDependency */,
+                               6C7C38811FD88C4700DFFE68 /* PBXTargetDependency */,
                        );
                        name = Security_executables_osx;
                        productName = Security_executables;
                        buildPhases = (
                        );
                        dependencies = (
+                               0C78CCE71FCC97F1008B4B24 /* PBXTargetDependency */,
                                D41257F11E941E7D00781F23 /* PBXTargetDependency */,
                                EB27FF281E40717400EC9E3A /* PBXTargetDependency */,
                                EBF374841DC058C00065D840 /* PBXTargetDependency */,
                                0CC827F2138712B100BD99B7 /* PBXTargetDependency */,
                                52D82BF616A627100078DFE5 /* PBXTargetDependency */,
                                CD0637811A840C6400C81E74 /* PBXTargetDependency */,
-                               5DDD0BEE16D6748900D6C0D6 /* PBXTargetDependency */,
                                4C52D0EE16EFCD720079966E /* PBXTargetDependency */,
                                BE197F631911742900BA91D1 /* PBXTargetDependency */,
                                BE4AC9B418B8020400B84964 /* PBXTargetDependency */,
                                DCB515D01ED3CC36001F1152 /* PBXTargetDependency */,
                                DC5224F91E4029520021640A /* PBXTargetDependency */,
                                EB0D30FA1EF12BFB00C3C17D /* PBXTargetDependency */,
+                               6CAA8D3D1F8431BC007B6E03 /* PBXTargetDependency */,
+                               6CAA8CE51F82FD08007B6E03 /* PBXTargetDependency */,
+                               6C7C38881FD88C5A00DFFE68 /* PBXTargetDependency */,
                        );
                        name = Security_executables_ios;
                        productName = phase2;
                        buildPhases = (
                        );
                        dependencies = (
-                               EB58A05E1E74C51F009C10D7 /* PBXTargetDependency */,
                                EB6A6FBB1B90F8EC0045DC68 /* PBXTargetDependency */,
                                4C541FA10F250C5200E508AE /* PBXTargetDependency */,
                                E7CFF6771C84F66A00E3484E /* PBXTargetDependency */,
+                               EB58A05E1E74C51F009C10D7 /* PBXTargetDependency */,
                        );
                        name = ios;
                        productName = world;
                                D41257F51E941E8E00781F23 /* PBXTargetDependency */,
                                EBF374881DC058CC0065D840 /* PBXTargetDependency */,
                                D41AD45C1B978A7A008C7270 /* PBXTargetDependency */,
-                               D41AD4721B978F76008C7270 /* PBXTargetDependency */,
                                D41AD45E1B978A7C008C7270 /* PBXTargetDependency */,
                                D41AD4601B978E18008C7270 /* PBXTargetDependency */,
                                D41AD4621B978E24008C7270 /* PBXTargetDependency */,
                                EBF374861DC058C50065D840 /* PBXTargetDependency */,
                                D41AD43A1B96721E008C7270 /* PBXTargetDependency */,
                                D41AD4521B9788B2008C7270 /* PBXTargetDependency */,
-                               D41AD45A1B978944008C7270 /* PBXTargetDependency */,
                                D41AD4461B9786A3008C7270 /* PBXTargetDependency */,
                                D41AD43E1B967242008C7270 /* PBXTargetDependency */,
                                D41AD43C1B96723B008C7270 /* PBXTargetDependency */,
                                EB58A0601E74C8D9009C10D7 /* PBXTargetDependency */,
                                EB10557F1E14DFBE0003C309 /* PBXTargetDependency */,
                                BE9C38D11EB115F4007E2AE1 /* PBXTargetDependency */,
+                               DCDB29761FD8839F00B5D242 /* PBXTargetDependency */,
                        );
                        name = Security_tests_osx;
                        productName = Security_test_macos;
                                EB58A0621E74C8E4009C10D7 /* PBXTargetDependency */,
                                EB10557D1E14DFB60003C309 /* PBXTargetDependency */,
                                BE9C38D31EB11605007E2AE1 /* PBXTargetDependency */,
+                               DCDB29781FD883AB00B5D242 /* PBXTargetDependency */,
                        );
                        name = Security_tests_ios;
                        productName = Security_test_ios;
                        buildPhases = (
                        );
                        dependencies = (
-                               DC71D9FD1D95BB440065FB93 /* PBXTargetDependency */,
                                DC71D9E11D95BAC40065FB93 /* PBXTargetDependency */,
-                               DC5AC1341D835C2300CF422C /* PBXTargetDependency */,
                                DC178BF31D77ABE300B50D50 /* PBXTargetDependency */,
                                BE9C38C81EB115A7007E2AE1 /* PBXTargetDependency */,
                                DC58C4431D77C1F8003C25A4 /* PBXTargetDependency */,
                0C0C88781CCEC5C400617D1B /* si-82-sectrust-ct-data in Resources */ = {isa = PBXBuildFile; fileRef = 0C0C88771CCEC5BD00617D1B /* si-82-sectrust-ct-data */; };
                0C0C88791CCEC5C500617D1B /* si-82-sectrust-ct-data in Resources */ = {isa = PBXBuildFile; fileRef = 0C0C88771CCEC5BD00617D1B /* si-82-sectrust-ct-data */; };
                0C0CECA41DA45ED700C22FBC /* recovery_key.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C0CEC9E1DA45EA200C22FBC /* recovery_key.m */; };
+               0C0DA5CE1FE1EAB9003BD3BB /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E7C01D7A463E00AFB96E /* SecurityFoundation.framework */; };
+               0C0DA5CF1FE1F1C5003BD3BB /* OTControlProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBF0D1FCB452300580909 /* OTControlProtocol.m */; };
+               0C0DA5D01FE1F1F3003BD3BB /* CKKSControlProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = DCF7A8A21F0450EB00CABE89 /* CKKSControlProtocol.m */; };
+               0C16371C1FD116B300210823 /* MockCloudKit.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3502E61E0214C800BC0587 /* MockCloudKit.m */; };
+               0C1637211FD12F1500210823 /* OTCloudStoreTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C16371F1FD12F1500210823 /* OTCloudStoreTests.m */; };
+               0C1637271FD2065400210823 /* spi.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB01D8085D800865A7C /* spi.c */; };
+               0C1637291FD2066A00210823 /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
+               0C16372B1FD2067F00210823 /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
+               0C16372D1FD2069300210823 /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
+               0C1637301FD206BC00210823 /* server_security_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.c */; };
                0C2BCBAF1D06401F00ED7A2F /* ioSock.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CE5A65809C79E0600D27A3F /* ioSock.c */; };
                0C2BCBB01D06401F00ED7A2F /* sslAppUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE5A65A09C79E0600D27A3F /* sslAppUtils.cpp */; };
                0C2BCBB41D06401F00ED7A2F /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
                0C2BCBC91D0648D100ED7A2F /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
                0C2BCBCA1D0648D100ED7A2F /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E43C48C1B00D07000E5ECB2 /* CoreFoundation.framework */; };
                0C2BCBCF1D0648EF00ED7A2F /* dtlsEchoServer.c in Sources */ = {isa = PBXBuildFile; fileRef = 0C2BCBA61D063F7D00ED7A2F /* dtlsEchoServer.c */; };
+               0C36B3212007F2550029F7A2 /* OTPreflightInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C36B3172007EE6C0029F7A2 /* OTPreflightInfo.m */; };
+               0C36B3222007F2570029F7A2 /* OTPreflightInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C36B3172007EE6C0029F7A2 /* OTPreflightInfo.m */; };
                0C3C00731EF3636500AB19FE /* secd-155-otr-negotiation-monitor.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C3C00721EF3636300AB19FE /* secd-155-otr-negotiation-monitor.m */; };
+               0C46A5712034C6BA00F17112 /* OTControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBF0E1FCB452400580909 /* OTControl.m */; };
+               0C46A57B2035019800F17112 /* OTLockStateNetworkingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C46A57A2035019800F17112 /* OTLockStateNetworkingTests.m */; };
                0C48990B1E0E0FF300C6CF70 /* SOSTransportCircleCK.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C48990A1E0E0FF300C6CF70 /* SOSTransportCircleCK.h */; };
                0C4899121E0E105D00C6CF70 /* SOSTransportCircleCK.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C4899111E0E105D00C6CF70 /* SOSTransportCircleCK.m */; };
-               0C48991C1E0F384700C6CF70 /* SOSAccountTrustClassic.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C48991B1E0F384700C6CF70 /* SOSAccountTrustClassic.m */; };
                0C4899231E0F386900C6CF70 /* SOSAccountTrustClassic.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C4899221E0F386900C6CF70 /* SOSAccountTrustClassic.h */; };
                0C4899251E0F38FA00C6CF70 /* SOSAccountTrustOctagon.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C4899241E0F38FA00C6CF70 /* SOSAccountTrustOctagon.m */; };
                0C4899271E0F399B00C6CF70 /* SOSAccountTrustOctagon.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C4899261E0F399B00C6CF70 /* SOSAccountTrustOctagon.h */; };
+               0C52C1FF20003BCA003F0733 /* OTTestsBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C52C1FE20003BCA003F0733 /* OTTestsBase.m */; };
+               0C59605A1FB2D8E50095BA29 /* libprequelite.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CE98B5B1FA9360700CF1D54 /* libprequelite.tbd */; };
+               0C59605C1FB2D9280095BA29 /* libprequelite.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CE98B5B1FA9360700CF1D54 /* libprequelite.tbd */; };
+               0C59605D1FB2D95D0095BA29 /* libprequelite.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CE98B5B1FA9360700CF1D54 /* libprequelite.tbd */; };
+               0C59605E1FB2D9990095BA29 /* libprequelite.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CE98B5B1FA9360700CF1D54 /* libprequelite.tbd */; };
+               0C59605F1FB2D9F60095BA29 /* libprequelite.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CE98B5B1FA9360700CF1D54 /* libprequelite.tbd */; };
+               0C5960601FB2DA310095BA29 /* libprequelite.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CE98B5B1FA9360700CF1D54 /* libprequelite.tbd */; };
+               0C5960621FB2E0EC0095BA29 /* libprequelite.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CE98B5B1FA9360700CF1D54 /* libprequelite.tbd */; };
+               0C5960631FB2E1A70095BA29 /* libprequelite.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CE98B5B1FA9360700CF1D54 /* libprequelite.tbd */; };
+               0C5960641FB2E2070095BA29 /* libprequelite.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CE98B5B1FA9360700CF1D54 /* libprequelite.tbd */; settings = {ATTRIBUTES = (Weak, ); }; };
+               0C5960651FB2E2800095BA29 /* libprequelite.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CE98B5B1FA9360700CF1D54 /* libprequelite.tbd */; };
+               0C5960811FB369C50095BA29 /* CKKSHealTLKSharesOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCBF2F841F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.m */; };
+               0C5CFB382019610000913B9C /* OTRamping.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C5CFB37201960FF00913B9C /* OTRamping.m */; };
+               0C5CFB392019610000913B9C /* OTRamping.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C5CFB37201960FF00913B9C /* OTRamping.m */; };
                0C5D62F11E81E74800AA4D02 /* SOSInternal.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D8D1D8085F200865A7C /* SOSInternal.m */; };
+               0C5F4FD81F952FEA00AF1616 /* secd-700-sftm.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C5F4FD71F952FEA00AF1616 /* secd-700-sftm.m */; };
+               0C770EBC1FCF7C9800B5F0E2 /* OTCloudStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8BBE891FC9DA5200580909 /* OTCloudStore.h */; };
+               0C770EC21FCF7C9800B5F0E2 /* OTCloudStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8BBE891FC9DA5200580909 /* OTCloudStore.h */; };
+               0C770EC41FCF7E2000B5F0E2 /* OTCloudStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C770EC31FCF7E2000B5F0E2 /* OTCloudStore.m */; };
+               0C770EC51FCF7E2000B5F0E2 /* OTCloudStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C770EC31FCF7E2000B5F0E2 /* OTCloudStore.m */; };
                0C78F1CC16A5E1BF00654E08 /* sectask-10-sectask.c in Sources */ = {isa = PBXBuildFile; fileRef = 0C78F1CA16A5E1BF00654E08 /* sectask-10-sectask.c */; };
                0C78F1CD16A5E1BF00654E08 /* sectask-10-sectask.c in Sources */ = {isa = PBXBuildFile; fileRef = 0C78F1CA16A5E1BF00654E08 /* sectask-10-sectask.c */; };
                0C78F1CE16A5E1BF00654E08 /* sectask_ipc.defs in Sources */ = {isa = PBXBuildFile; fileRef = 0C78F1CB16A5E1BF00654E08 /* sectask_ipc.defs */; settings = {ATTRIBUTES = (Client, Server, ); }; };
                0C78F1CF16A5E1BF00654E08 /* sectask_ipc.defs in Sources */ = {isa = PBXBuildFile; fileRef = 0C78F1CB16A5E1BF00654E08 /* sectask_ipc.defs */; settings = {ATTRIBUTES = (Client, Server, ); }; };
                0C78F1D016A5E3EB00654E08 /* libbsm.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 107227350D91FE89003CF14F /* libbsm.dylib */; };
+               0C85DFE71FB38BB6000343A7 /* libASN1_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1_not_installed.a */; };
+               0C85DFE81FB38BB6000343A7 /* libsecurityd_ios_NO_AKS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC222C771E034D1F00B09171 /* libsecurityd_ios_NO_AKS.a */; };
+               0C85DFE91FB38BB6000343A7 /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
+               0C85DFEA1FB38BB6000343A7 /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };
+               0C85DFEB1FB38BB6000343A7 /* libsecurity.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCC78EA91D8088E200865A7C /* libsecurity.a */; };
+               0C85DFEC1FB38BB6000343A7 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
+               0C85DFED1FB38BB6000343A7 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF730310EF9CDE300E17471 /* CFNetwork.framework */; };
+               0C85DFEE1FB38BB6000343A7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
+               0C85DFF01FB38BB6000343A7 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
+               0C85DFF11FB38BB6000343A7 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC3502E81E02172C00BC0587 /* OCMock.framework */; };
+               0C85DFF31FB38BB6000343A7 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };
+               0C85DFF41FB38BB6000343A7 /* libACM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC610A3A1D78F228002223DE /* libACM.a */; };
+               0C85DFF51FB38BB6000343A7 /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };
+               0C85DFF61FB38BB6000343A7 /* libDER.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D46246CE1F9AEAE300D63882 /* libDER.a */; };
+               0C85DFF71FB38BB6000343A7 /* libbsm.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 107227350D91FE89003CF14F /* libbsm.dylib */; };
+               0C85DFF81FB38BB6000343A7 /* libcoreauthd_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF6A1A01458F000958DC /* libcoreauthd_client.a */; };
+               0C85DFF91FB38BB6000343A7 /* libctkclient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4469FBDD1AA0A45C0021AA26 /* libctkclient.a */; };
+               0C85DFFA1FB38BB6000343A7 /* libsqlite3.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC27B57D1DDFC24500599261 /* libsqlite3.0.dylib */; };
+               0C85DFFB1FB38BB6000343A7 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BE8ABDD71DC2DD9100EC2D58 /* libz.dylib */; };
+               0C85DFFE1FB38BB6000343A7 /* OCMock.framework in Embed OCMock */ = {isa = PBXBuildFile; fileRef = DC3502E81E02172C00BC0587 /* OCMock.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+               0C8A03461FDF42BA0042E8BE /* OTEscrowKeyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8A03451FDF42BA0042E8BE /* OTEscrowKeyTests.m */; };
+               0C8A034D1FDF4CCE0042E8BE /* OTLocalStoreTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8A034C1FDF4CCE0042E8BE /* OTLocalStoreTests.m */; };
+               0C8A034F1FDF60070042E8BE /* OTBottledPeerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8A034E1FDF60070042E8BE /* OTBottledPeerTests.m */; };
+               0C8BBE9F1FC9DBA400580909 /* OTBottledPeer.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBE931FC9DA5700580909 /* OTBottledPeer.m */; };
+               0C8BBEA01FC9DBA400580909 /* OTBottledPeer.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBE931FC9DA5700580909 /* OTBottledPeer.m */; };
+               0C8BBEA21FC9DBAA00580909 /* OTContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBE981FC9DA5A00580909 /* OTContext.m */; };
+               0C8BBEA51FC9DBB100580909 /* OTEscrowKeys.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBE961FC9DA5900580909 /* OTEscrowKeys.m */; };
+               0C8BBEA61FC9DBB200580909 /* OTEscrowKeys.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBE961FC9DA5900580909 /* OTEscrowKeys.m */; };
+               0C8BBEA71FC9DBB500580909 /* OTIdentity.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBE8D1FC9DA5400580909 /* OTIdentity.m */; };
+               0C8BBEA81FC9DBB600580909 /* OTIdentity.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBE8D1FC9DA5400580909 /* OTIdentity.m */; };
+               0C8BBEA91FC9DBBF00580909 /* OTLocalStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBE8C1FC9DA5400580909 /* OTLocalStore.m */; };
+               0C8BBEAA1FC9DBC000580909 /* OTLocalStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBE8C1FC9DA5400580909 /* OTLocalStore.m */; };
+               0C8BBEE61FCA6E0500580909 /* OTContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBE981FC9DA5A00580909 /* OTContext.m */; };
+               0C8BBEFF1FCB446400580909 /* SecArgParse.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5BCC461E5380EA00649140 /* SecArgParse.c */; };
+               0C8BBF031FCB446400580909 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };
+               0C8BBF091FCB447600580909 /* otctl.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBEF71FCB405700580909 /* otctl.m */; };
+               0C8BBF111FCB4AAA00580909 /* OTControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBF0E1FCB452400580909 /* OTControl.m */; };
+               0C8BBF121FCB4AAB00580909 /* OTControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBF0E1FCB452400580909 /* OTControl.m */; };
+               0C8BBF131FCB4AFA00580909 /* OTControlProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBF0D1FCB452300580909 /* OTControlProtocol.m */; };
+               0C8BBF141FCB4AFB00580909 /* OTControlProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBF0D1FCB452300580909 /* OTControlProtocol.m */; };
+               0C8BBF151FCB4B1B00580909 /* OTManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBF0F1FCB481800580909 /* OTManager.m */; };
+               0C8BBF161FCB4B1C00580909 /* OTManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBF0F1FCB481800580909 /* OTManager.m */; };
+               0C8BBF171FCB4E5000580909 /* OTControlProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBF0D1FCB452300580909 /* OTControlProtocol.m */; };
+               0C8BBF181FCB4E5000580909 /* OTControlProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBF0D1FCB452300580909 /* OTControlProtocol.m */; };
+               0C8BBF1B1FCB4EC500580909 /* OTControlProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBF0D1FCB452300580909 /* OTControlProtocol.m */; };
+               0C8BBF1C1FCB4F0300580909 /* OTControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8BBF0B1FCB452200580909 /* OTControl.h */; };
+               0C8BBF1D1FCB4F0300580909 /* OTControlProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8BBF0C1FCB452200580909 /* OTControlProtocol.h */; };
+               0C8BBF1E1FCB4F0400580909 /* OTControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8BBF0B1FCB452200580909 /* OTControl.h */; };
+               0C8BBF1F1FCB4F0400580909 /* OTControlProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8BBF0C1FCB452200580909 /* OTControlProtocol.h */; };
+               0C8BBF201FCB4F1800580909 /* OTControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8BBF0B1FCB452200580909 /* OTControl.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               0C8BBF211FCB4F1800580909 /* OTControlProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8BBF0C1FCB452200580909 /* OTControlProtocol.h */; };
+               0C8BBF221FCB4F1800580909 /* OTControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8BBF0B1FCB452200580909 /* OTControl.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               0C8BBF231FCB4F1800580909 /* OTControlProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8BBF0C1FCB452200580909 /* OTControlProtocol.h */; };
+               0C8BBF241FCB4FE700580909 /* OTManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8BBF101FCB486B00580909 /* OTManager.h */; };
+               0C8BBF251FCB4FE800580909 /* OTManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8BBF101FCB486B00580909 /* OTManager.h */; };
+               0C8BBF261FCB561C00580909 /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E9411D7F3E6E00AFB96E /* CoreCDP.framework */; };
+               0C8BBF2B1FCB575800580909 /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E9411D7F3E6E00AFB96E /* CoreCDP.framework */; };
+               0C8BBF2D1FCB5A2900580909 /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E9411D7F3E6E00AFB96E /* CoreCDP.framework */; };
+               0C8BBFFD1FCE8F3300580909 /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E9411D7F3E6E00AFB96E /* CoreCDP.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+               0CA4EBF3202B8D9C002B1D96 /* CloudKitKeychainSyncingTestsBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CA4EBF2202B8D1D002B1D96 /* CloudKitKeychainSyncingTestsBase.m */; };
+               0CA4EBF4202B8DBE002B1D96 /* CloudKitKeychainSyncingTestsBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CA4EBF2202B8D1D002B1D96 /* CloudKitKeychainSyncingTestsBase.m */; };
+               0CA4EC10202BB5AF002B1D96 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF4C19C171E0EA600877419 /* Accounts.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+               0CA4EC11202BB5E9002B1D96 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF4C19C171E0EA600877419 /* Accounts.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                0CAC5DBF1EB3DA4C00AD884B /* SOSPeerRateLimiter.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CAC5DBE1EB3DA4C00AD884B /* SOSPeerRateLimiter.m */; };
                0CAD1E1C1E032ADB00537693 /* SOSCloudCircleServer.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CAA1D8085D800865A7C /* SOSCloudCircleServer.m */; };
                0CAD1E581E1C5C6C00537693 /* SOSCloudCircle.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D891D8085F200865A7C /* SOSCloudCircle.m */; };
                0CAD1E5C1E1C5CEB00537693 /* secd_77_ids_messaging.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C691D8085D800865A7C /* secd_77_ids_messaging.m */; };
                0CAD1E5D1E1C5CF900537693 /* secd-80-views-alwayson.m in Sources */ = {isa = PBXBuildFile; fileRef = 7281E08B1DFD0A380021E1B7 /* secd-80-views-alwayson.m */; };
                0CAD1E5E1E1C5D0600537693 /* secd-95-escrow-persistence.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C741D8085D800865A7C /* secd-95-escrow-persistence.m */; };
+               0CAEC9D81FD740CF00D1F2CA /* OTContextTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBEAF1FC9DCA400580909 /* OTContextTests.m */; };
+               0CB9754E2023A8DD008D6B48 /* CloudKitKeychainSyncingMockXCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DC08D1C31E64FA8C006237DA /* CloudKitKeychainSyncingMockXCTest.m */; };
+               0CB9754F2023A8F5008D6B48 /* CloudKitMockXCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DC222CA71E08A7D900B09171 /* CloudKitMockXCTest.m */; };
+               0CB975512023B199008D6B48 /* OTRampingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CB975502023B199008D6B48 /* OTRampingTests.m */; };
+               0CBD55B31FE883F200A8CE21 /* SFBehavior.m in Sources */ = {isa = PBXBuildFile; fileRef = EB82A2A51FAFF26900CA64A9 /* SFBehavior.m */; };
+               0CBD55B91FE883F300A8CE21 /* SFBehavior.m in Sources */ = {isa = PBXBuildFile; fileRef = EB82A2A51FAFF26900CA64A9 /* SFBehavior.m */; };
+               0CBDF64D1FFC951200433E0D /* OTBottledPeerTLK.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CBDF64C1FFC951200433E0D /* OTBottledPeerTLK.m */; };
+               0CBFEACA200FCD2D009A60E9 /* SFTransactionMetric.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CF0E2E31F8EE3B000BD18E4 /* SFTransactionMetric.m */; };
+               0CBFEACB200FCD2D009A60E9 /* SFTransactionMetric.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CF0E2E31F8EE3B000BD18E4 /* SFTransactionMetric.m */; };
+               0CBFEACC200FCD33009A60E9 /* SFTransactionMetric.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CF0E2E71F8EE40700BD18E4 /* SFTransactionMetric.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               0CBFEACD200FCD33009A60E9 /* SFTransactionMetric.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CF0E2E71F8EE40700BD18E4 /* SFTransactionMetric.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               0CC0445B1FFC4150004A5B63 /* CKKSControl.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9C95B31F79CFD1000D19E5 /* CKKSControl.m */; };
                0CC319241DA46FBF005D42EA /* ProtectedCloudStorage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43DB542E1BB1F85B0083C3F1 /* ProtectedCloudStorage.framework */; };
+               0CCCC7C920261D310024405E /* OT.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CCCC7C820261D310024405E /* OT.m */; };
+               0CCCC7CA20261D310024405E /* OT.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CCCC7C820261D310024405E /* OT.m */; };
                0CCDE7171EEB08220021A946 /* secd-156-timers.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CCDE7161EEB08220021A946 /* secd-156-timers.m */; };
                0CD8CB051ECA50780076F37F /* SOSPeerOTRTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CD8CB041ECA50780076F37F /* SOSPeerOTRTimer.m */; };
                0CD8CB0B1ECA50920076F37F /* SOSPeerOTRTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CD8CB041ECA50780076F37F /* SOSPeerOTRTimer.m */; };
+               0CD9E8001FE05B6600F66C38 /* OTContextRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CD9E7FF1FE05B6600F66C38 /* OTContextRecord.m */; };
+               0CD9E8011FE05B6600F66C38 /* OTContextRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CD9E7FF1FE05B6600F66C38 /* OTContextRecord.m */; };
+               0CE1BCCE1FCE11680017230E /* OTBottledPeerSigned.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE1BCC61FCE11480017230E /* OTBottledPeerSigned.m */; };
+               0CE1BCCF1FCE11690017230E /* OTBottledPeerSigned.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE1BCC61FCE11480017230E /* OTBottledPeerSigned.m */; };
+               0CE407AC1FD4769B00F59B31 /* OTCloudStoreState.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE407AB1FD4769B00F59B31 /* OTCloudStoreState.m */; };
+               0CE407AD1FD4769B00F59B31 /* OTCloudStoreState.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE407AB1FD4769B00F59B31 /* OTCloudStoreState.m */; };
                0CE760481E12F2F300B4381E /* SOSAccountTrustClassic+Expansion.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE760471E12F2F200B4381E /* SOSAccountTrustClassic+Expansion.m */; };
                0CE7604A1E12F30200B4381E /* SOSAccountTrustClassic+Circle.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE760491E12F30200B4381E /* SOSAccountTrustClassic+Circle.m */; };
                0CE7604C1E12F56800B4381E /* SOSAccountTrustClassic+Identity.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE7604B1E12F56800B4381E /* SOSAccountTrustClassic+Identity.m */; };
                220179EB1E3BF1F100EFB6F3 /* detachedrep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067E11D8CDF7E007602F1 /* detachedrep.cpp */; };
                222F239F1DAC15C5007ACB90 /* SecTaskPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD068031D8CDF7E007602F1 /* SecTaskPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                222F23A01DAC1603007ACB90 /* SecTaskPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD068031D8CDF7E007602F1 /* SecTaskPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               225394B71E3081F900D3CD9B /* cskernel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067CA1D8CDF7E007602F1 /* cskernel.cpp */; };
                225394B81E30820900D3CD9B /* Code.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067A01D8CDF7E007602F1 /* Code.cpp */; };
                225394B91E30821400D3CD9B /* bundlediskrep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067D51D8CDF7E007602F1 /* bundlediskrep.cpp */; };
                225394BA1E30821E00D3CD9B /* cdbuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067B01D8CDF7E007602F1 /* cdbuilder.cpp */; };
                225394C11E30827600D3CD9B /* filediskrep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067D31D8CDF7E007602F1 /* filediskrep.cpp */; };
                225394C21E30827E00D3CD9B /* kerneldiskrep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067D71D8CDF7E007602F1 /* kerneldiskrep.cpp */; };
                225394C31E30828800D3CD9B /* StaticCode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067A21D8CDF7E007602F1 /* StaticCode.cpp */; };
-               225394C41E30829300D3CD9B /* reqparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067C31D8CDF7E007602F1 /* reqparser.cpp */; };
                225394C51E3082A100D3CD9B /* requirement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067BB1D8CDF7E007602F1 /* requirement.cpp */; };
                225394C61E3082AB00D3CD9B /* Requirements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067A41D8CDF7E007602F1 /* Requirements.cpp */; };
                225394C71E3082B600D3CD9B /* reqdumper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067C51D8CDF7E007602F1 /* reqdumper.cpp */; };
                225394D01E30836200D3CD9B /* singlediskrep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067DF1D8CDF7E007602F1 /* singlediskrep.cpp */; };
                225394D11E30836F00D3CD9B /* reqreader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067BF1D8CDF7E007602F1 /* reqreader.cpp */; };
                225394D21E30837900D3CD9B /* cserror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067F11D8CDF7E007602F1 /* cserror.cpp */; };
-               225394D31E3083C600D3CD9B /* SecCodeHost.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785841D778B8000B50D50 /* SecCodeHost.h */; settings = {ATTRIBUTES = (Private, ); }; };
                225394D41E3083D000D3CD9B /* CodeSigning.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785811D778B7F00B50D50 /* CodeSigning.h */; settings = {ATTRIBUTES = (Private, ); }; };
                225394D51E3083DA00D3CD9B /* CSCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785821D778B7F00B50D50 /* CSCommon.h */; settings = {ATTRIBUTES = (Private, ); }; };
                225394D61E3083E300D3CD9B /* SecCode.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785831D778B7F00B50D50 /* SecCode.h */; settings = {ATTRIBUTES = (Private, ); }; };
                22A23B3C1E3AAC9800C41830 /* SecCode.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD0678D1D8CDF7E007602F1 /* SecCode.h */; settings = {ATTRIBUTES = (Private, ); }; };
                22A23B3D1E3AAC9800C41830 /* SecStaticCode.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD067901D8CDF7E007602F1 /* SecStaticCode.h */; settings = {ATTRIBUTES = (Private, ); }; };
                22A23B3E1E3AAC9800C41830 /* SecRequirement.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD067931D8CDF7E007602F1 /* SecRequirement.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               22A23B3F1E3AAC9800C41830 /* SecCodeHost.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD067981D8CDF7E007602F1 /* SecCodeHost.h */; settings = {ATTRIBUTES = (Private, ); }; };
                22E337DA1E37FD66001D5637 /* libsecurity_codesigning_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 225394B41E3080A600D3CD9B /* libsecurity_codesigning_ios.a */; };
                24CBF8751E9D4E6100F09F0E /* kc-44-secrecoverypassword.c in Sources */ = {isa = PBXBuildFile; fileRef = 24CBF8731E9D4E4500F09F0E /* kc-44-secrecoverypassword.c */; };
                433E519E1B66D5F600482618 /* AppSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 433E519D1B66D5F600482618 /* AppSupport.framework */; };
                44A655A61AA4B4C80059D185 /* libctkclient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4469FBDD1AA0A45C0021AA26 /* libctkclient.a */; };
                470415DC1E5E1534001F3D95 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 470415DB1E5E1534001F3D95 /* main.m */; };
                4710A6D91F34F21700745267 /* CrashReporterSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E9391D7F3DF200AFB96E /* CrashReporterSupport.framework */; };
+               471A03EC1F72E35B000A8904 /* SecDbKeychainItemV7.m in Sources */ = {isa = PBXBuildFile; fileRef = 470ACEF31F58C3A600D1D5BD /* SecDbKeychainItemV7.m */; };
+               471A03F21F72E35C000A8904 /* SecDbKeychainItemV7.m in Sources */ = {isa = PBXBuildFile; fileRef = 470ACEF31F58C3A600D1D5BD /* SecDbKeychainItemV7.m */; };
+               472339671FD7155E00CB6A72 /* libprequelite.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 472339611FD7155C00CB6A72 /* libprequelite.dylib */; };
+               472339691FD7156800CB6A72 /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 472339681FD7156700CB6A72 /* CoreCDP.framework */; };
                4723C9C21F152EB50082882F /* SFObjCType.h in Headers */ = {isa = PBXBuildFile; fileRef = 4723C9C01F152EB10082882F /* SFObjCType.h */; };
                4723C9C31F152EB60082882F /* SFObjCType.h in Headers */ = {isa = PBXBuildFile; fileRef = 4723C9C01F152EB10082882F /* SFObjCType.h */; };
-               4723C9C41F152EBB0082882F /* SFObjCType.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BE1F152EB10082882F /* SFObjCType.m */; };
-               4723C9C51F152EBC0082882F /* SFObjCType.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BE1F152EB10082882F /* SFObjCType.m */; };
                4723C9C61F152EC00082882F /* SFSQLite.h in Headers */ = {isa = PBXBuildFile; fileRef = 4723C9BD1F152EB10082882F /* SFSQLite.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4723C9C71F152EC10082882F /* SFSQLite.h in Headers */ = {isa = PBXBuildFile; fileRef = 4723C9BD1F152EB10082882F /* SFSQLite.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               4723C9C81F152ECA0082882F /* SFSQLite.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BC1F152EB10082882F /* SFSQLite.m */; };
-               4723C9C91F152ECA0082882F /* SFSQLite.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BC1F152EB10082882F /* SFSQLite.m */; };
                4723C9CA1F152ECE0082882F /* SFSQLiteStatement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4723C9C11F152EB10082882F /* SFSQLiteStatement.h */; };
                4723C9CB1F152ECF0082882F /* SFSQLiteStatement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4723C9C11F152EB10082882F /* SFSQLiteStatement.h */; };
                4723C9CC1F152ED30082882F /* SFSQLiteStatement.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BF1F152EB10082882F /* SFSQLiteStatement.m */; };
                4723C9CD1F152ED40082882F /* SFSQLiteStatement.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BF1F152EB10082882F /* SFSQLiteStatement.m */; };
                4723C9D41F1531A30082882F /* CKKSLoggerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9D11F1531970082882F /* CKKSLoggerTests.m */; };
-               4723C9DC1F1540CE0082882F /* SFAnalyticsLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 4723C9DA1F1540CE0082882F /* SFAnalyticsLogger.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               4723C9DD1F1540CE0082882F /* SFAnalyticsLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 4723C9DA1F1540CE0082882F /* SFAnalyticsLogger.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               4723C9E01F1540CE0082882F /* SFAnalyticsLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9DB1F1540CE0082882F /* SFAnalyticsLogger.m */; };
-               4723C9E11F1540CE0082882F /* SFAnalyticsLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9DB1F1540CE0082882F /* SFAnalyticsLogger.m */; };
+               4727FBBA1F9918590003AE36 /* KeychainCryptoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4727FBB91F9918590003AE36 /* KeychainCryptoTests.m */; };
+               4727FBC51F991C470003AE36 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBC41F991C460003AE36 /* Foundation.framework */; };
+               4727FBC61F991DE90003AE36 /* libsecdRegressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EDB11D80D58400B0A59C /* libsecdRegressions.a */; };
+               4727FBC71F991E3A0003AE36 /* libsecurity.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCC78EA91D8088E200865A7C /* libsecurity.a */; };
+               4727FBC81F991E460003AE36 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
+               4727FBC91F991E5A0003AE36 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
+               4727FBCB1F991F510003AE36 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBCA1F991F510003AE36 /* Security.framework */; };
+               4727FBCD1F991F660003AE36 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBCC1F991F660003AE36 /* libsqlite3.dylib */; };
+               4727FBCE1F991F820003AE36 /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBCF1F991F820003AE36 /* SecurityFoundation.framework */; };
+               4727FBD11F991F990003AE36 /* libMobileGestalt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBD01F991F990003AE36 /* libMobileGestalt.dylib */; };
+               4727FBD31F9920290003AE36 /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBD21F9920290003AE36 /* CloudKit.framework */; };
+               4727FBD51F9920510003AE36 /* ProtocolBuffer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBD41F9920510003AE36 /* ProtocolBuffer.framework */; };
+               4727FBD61F9920960003AE36 /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
+               4727FBD71F99209C0003AE36 /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };
+               4727FBD91F9920BC0003AE36 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBD81F9920BB0003AE36 /* SystemConfiguration.framework */; };
+               4727FBDB1F9920CC0003AE36 /* WirelessDiagnostics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBDA1F9920CB0003AE36 /* WirelessDiagnostics.framework */; };
+               4727FBDD1F9920F20003AE36 /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBDC1F9920F10003AE36 /* libaks_acl.a */; };
+               4727FBDF1F99211D0003AE36 /* libaks.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBDE1F99211D0003AE36 /* libaks.a */; };
+               4727FBE11F9921300003AE36 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBE01F99212F0003AE36 /* IOKit.framework */; };
+               4727FBE31F9921660003AE36 /* MobileKeyBag.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBE21F9921660003AE36 /* MobileKeyBag.framework */; };
+               4727FBE51F99217B0003AE36 /* SharedWebCredentials.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBE41F99217A0003AE36 /* SharedWebCredentials.framework */; };
+               4727FBE71F99218A0003AE36 /* ApplePushService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBE61F9921890003AE36 /* ApplePushService.framework */; };
+               4727FBE91F9921D10003AE36 /* libACM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBE81F9921D00003AE36 /* libACM.a */; };
+               4727FBEA1F9922190003AE36 /* libregressionBase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCBFD1D8C648C00070CB0 /* libregressionBase.a */; };
+               4727FBEB1F99227F0003AE36 /* spi.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB01D8085D800865A7C /* spi.c */; };
+               4727FBEC1F99235B0003AE36 /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
+               4727FBED1F99249A0003AE36 /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
+               4727FBEE1F9924DA0003AE36 /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
+               4727FBEF1F9924FB0003AE36 /* server_security_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.c */; };
+               473337791FDAFBCC00E19F30 /* SFKeychainControlManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 473337771FDAFBCC00E19F30 /* SFKeychainControlManager.h */; };
+               4733377A1FDAFBCC00E19F30 /* SFKeychainControlManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 473337771FDAFBCC00E19F30 /* SFKeychainControlManager.h */; };
+               4733377B1FDAFBCC00E19F30 /* SFKeychainControlManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 473337781FDAFBCC00E19F30 /* SFKeychainControlManager.m */; };
+               4733377C1FDAFBCC00E19F30 /* SFKeychainControlManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 473337781FDAFBCC00E19F30 /* SFKeychainControlManager.m */; };
+               473337841FDB29C400E19F30 /* KeychainCheck.m in Sources */ = {isa = PBXBuildFile; fileRef = 473337831FDB29A200E19F30 /* KeychainCheck.m */; };
                474B5FC61E662E48007546F8 /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E7C01D7A463E00AFB96E /* SecurityFoundation.framework */; };
                474B5FC71E662E67007546F8 /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 474B5FBF1E662E21007546F8 /* SecurityFoundation.framework */; };
                474B5FC81E662E79007546F8 /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E7C01D7A463E00AFB96E /* SecurityFoundation.framework */; };
-               475F37201EE8F23900248FB5 /* SFAnalyticsLogging.plist in Resources */ = {isa = PBXBuildFile; fileRef = 475F371F1EE8F23900248FB5 /* SFAnalyticsLogging.plist */; };
-               475F37211EE8F23900248FB5 /* SFAnalyticsLogging.plist in Resources */ = {isa = PBXBuildFile; fileRef = 475F371F1EE8F23900248FB5 /* SFAnalyticsLogging.plist */; };
+               475F37201EE8F23900248FB5 /* SFAnalytics.plist in Resources */ = {isa = PBXBuildFile; fileRef = 475F371F1EE8F23900248FB5 /* SFAnalytics.plist */; };
+               475F37211EE8F23900248FB5 /* SFAnalytics.plist in Resources */ = {isa = PBXBuildFile; fileRef = 475F371F1EE8F23900248FB5 /* SFAnalytics.plist */; };
                476541651F339F6300413F65 /* SecdWatchdog.h in Headers */ = {isa = PBXBuildFile; fileRef = 476541631F339F6300413F65 /* SecdWatchdog.h */; };
                476541701F33B59300413F65 /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
                476541711F33B59500413F65 /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
                47702B291E5F463400B29577 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };
                47702B371E5F495C00B29577 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 47702B351E5F495C00B29577 /* main.m */; };
                47702B391E5F4B2200B29577 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };
-               4771ECCC1F17CD0E00840998 /* SFSQLite.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BC1F152EB10082882F /* SFSQLite.m */; };
                4771ECCD1F17CD0E00840998 /* SFSQLiteStatement.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BF1F152EB10082882F /* SFSQLiteStatement.m */; };
-               4771ECCE1F17CD2100840998 /* SFObjCType.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BE1F152EB10082882F /* SFObjCType.m */; };
-               4771ECD91F17CE5100840998 /* SFAnalyticsLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9DB1F1540CE0082882F /* SFAnalyticsLogger.m */; };
-               479108B71EE879F9008CEFA0 /* CKKSAnalyticsLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 479108B51EE879F9008CEFA0 /* CKKSAnalyticsLogger.h */; };
-               479108B81EE879F9008CEFA0 /* CKKSAnalyticsLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 479108B51EE879F9008CEFA0 /* CKKSAnalyticsLogger.h */; };
-               479108B91EE879F9008CEFA0 /* CKKSAnalyticsLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 479108B61EE879F9008CEFA0 /* CKKSAnalyticsLogger.m */; };
-               479108BA1EE879F9008CEFA0 /* CKKSAnalyticsLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 479108B61EE879F9008CEFA0 /* CKKSAnalyticsLogger.m */; };
+               477A1F5220320E4A00ACD81D /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 477A1F4C20320E4900ACD81D /* Accounts.framework */; };
+               477A1F5320320E5100ACD81D /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF4C19C171E0EA600877419 /* Accounts.framework */; };
+               477A1FE4203763A500ACD81D /* KeychainAPITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 477A1FE1203763A500ACD81D /* KeychainAPITests.m */; };
+               477A1FE5203763A500ACD81D /* KeychainAPITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 477A1FE1203763A500ACD81D /* KeychainAPITests.m */; };
+               477A1FED2037A0E000ACD81D /* KeychainXCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 477A1FEC2037A0E000ACD81D /* KeychainXCTest.m */; };
+               477A1FEE2037A0E000ACD81D /* KeychainXCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 477A1FEC2037A0E000ACD81D /* KeychainXCTest.m */; };
+               478D42761FD72A8100CAB645 /* server_xpc.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB2214A1E8B0861001598BC /* server_xpc.m */; };
+               478D42771FD72A8100CAB645 /* server_security_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.c */; };
+               478D42781FD72A8100CAB645 /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
+               478D42791FD72A8100CAB645 /* spi.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB01D8085D800865A7C /* spi.c */; };
+               478D427A1FD72A8100CAB645 /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
+               478D427B1FD72A8100CAB645 /* KeychainCryptoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4727FBB91F9918590003AE36 /* KeychainCryptoTests.m */; };
+               478D427C1FD72A8100CAB645 /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
+               478D427E1FD72A8100CAB645 /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 472339681FD7156700CB6A72 /* CoreCDP.framework */; };
+               478D427F1FD72A8100CAB645 /* libprequelite.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 472339611FD7155C00CB6A72 /* libprequelite.dylib */; };
+               478D42801FD72A8100CAB645 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47D1838B1FB3827700CFCD89 /* OCMock.framework */; };
+               478D42811FD72A8100CAB645 /* libregressionBase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCBFD1D8C648C00070CB0 /* libregressionBase.a */; };
+               478D42821FD72A8100CAB645 /* libACM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBE81F9921D00003AE36 /* libACM.a */; };
+               478D42831FD72A8100CAB645 /* ApplePushService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBE61F9921890003AE36 /* ApplePushService.framework */; };
+               478D42841FD72A8100CAB645 /* SharedWebCredentials.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBE41F99217A0003AE36 /* SharedWebCredentials.framework */; };
+               478D42851FD72A8100CAB645 /* MobileKeyBag.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBE21F9921660003AE36 /* MobileKeyBag.framework */; };
+               478D42861FD72A8100CAB645 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBE01F99212F0003AE36 /* IOKit.framework */; };
+               478D42871FD72A8100CAB645 /* libaks.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBDE1F99211D0003AE36 /* libaks.a */; };
+               478D42881FD72A8100CAB645 /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBDC1F9920F10003AE36 /* libaks_acl.a */; };
+               478D42891FD72A8100CAB645 /* WirelessDiagnostics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBDA1F9920CB0003AE36 /* WirelessDiagnostics.framework */; };
+               478D428A1FD72A8100CAB645 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBD81F9920BB0003AE36 /* SystemConfiguration.framework */; };
+               478D428B1FD72A8100CAB645 /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };
+               478D428C1FD72A8100CAB645 /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
+               478D428D1FD72A8100CAB645 /* ProtocolBuffer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBD41F9920510003AE36 /* ProtocolBuffer.framework */; };
+               478D428E1FD72A8100CAB645 /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBD21F9920290003AE36 /* CloudKit.framework */; };
+               478D42901FD72A8100CAB645 /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBCF1F991F820003AE36 /* SecurityFoundation.framework */; };
+               478D42911FD72A8100CAB645 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBCC1F991F660003AE36 /* libsqlite3.dylib */; };
+               478D42921FD72A8100CAB645 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBCA1F991F510003AE36 /* Security.framework */; };
+               478D42931FD72A8100CAB645 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
+               478D42941FD72A8100CAB645 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
+               478D42951FD72A8100CAB645 /* libsecurity.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCC78EA91D8088E200865A7C /* libsecurity.a */; };
+               478D42961FD72A8100CAB645 /* libsecdRegressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EDB11D80D58400B0A59C /* libsecdRegressions.a */; };
+               478D42971FD72A8100CAB645 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBC41F991C460003AE36 /* Foundation.framework */; };
+               478D429E1FD72C4800CAB645 /* CrashReporterSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E9391D7F3DF200AFB96E /* CrashReporterSupport.framework */; };
+               478D429F1FD72C8400CAB645 /* AppleSystemInfo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC610A3F1D78F2FF002223DE /* AppleSystemInfo.framework */; };
+               479108B71EE879F9008CEFA0 /* CKKSAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 479108B51EE879F9008CEFA0 /* CKKSAnalytics.h */; };
+               479108B81EE879F9008CEFA0 /* CKKSAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 479108B51EE879F9008CEFA0 /* CKKSAnalytics.h */; };
+               479108B91EE879F9008CEFA0 /* CKKSAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 479108B61EE879F9008CEFA0 /* CKKSAnalytics.m */; };
+               479108BA1EE879F9008CEFA0 /* CKKSAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 479108B61EE879F9008CEFA0 /* CKKSAnalytics.m */; };
+               47922D211FAA76000008F7E0 /* SecDbKeychainSerializedMetadata.proto in Resources */ = {isa = PBXBuildFile; fileRef = 47922D201FAA75FF0008F7E0 /* SecDbKeychainSerializedMetadata.proto */; };
+               47922D2D1FAA77970008F7E0 /* SecDbKeychainSerializedSecretData.proto in Resources */ = {isa = PBXBuildFile; fileRef = 47922D2C1FAA77970008F7E0 /* SecDbKeychainSerializedSecretData.proto */; };
+               47922D421FAA7C240008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.h in Headers */ = {isa = PBXBuildFile; fileRef = 47922D371FAA7C040008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.h */; };
+               47922D431FAA7C260008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.h in Headers */ = {isa = PBXBuildFile; fileRef = 47922D371FAA7C040008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.h */; };
+               47922D441FAA7C2C0008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D361FAA7C030008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.m */; };
+               47922D451FAA7C2E0008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D361FAA7C030008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.m */; };
+               47922D461FAA7C340008F7E0 /* SecDbKeychainSerializedMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 47922D3B1FAA7C100008F7E0 /* SecDbKeychainSerializedMetadata.h */; };
+               47922D471FAA7C350008F7E0 /* SecDbKeychainSerializedMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 47922D3B1FAA7C100008F7E0 /* SecDbKeychainSerializedMetadata.h */; };
+               47922D481FAA7C3C0008F7E0 /* SecDbKeychainSerializedMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D3A1FAA7C0F0008F7E0 /* SecDbKeychainSerializedMetadata.m */; };
+               47922D491FAA7C3D0008F7E0 /* SecDbKeychainSerializedMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D3A1FAA7C0F0008F7E0 /* SecDbKeychainSerializedMetadata.m */; };
+               47922D4A1FAA7C430008F7E0 /* SecDbKeychainSerializedSecretData.h in Headers */ = {isa = PBXBuildFile; fileRef = 47922D3E1FAA7C1A0008F7E0 /* SecDbKeychainSerializedSecretData.h */; };
+               47922D4B1FAA7C440008F7E0 /* SecDbKeychainSerializedSecretData.h in Headers */ = {isa = PBXBuildFile; fileRef = 47922D3E1FAA7C1A0008F7E0 /* SecDbKeychainSerializedSecretData.h */; };
+               47922D4C1FAA7C4A0008F7E0 /* SecDbKeychainSerializedSecretData.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D3F1FAA7C1B0008F7E0 /* SecDbKeychainSerializedSecretData.m */; };
+               47922D4D1FAA7C4B0008F7E0 /* SecDbKeychainSerializedSecretData.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D3F1FAA7C1B0008F7E0 /* SecDbKeychainSerializedSecretData.m */; };
+               47922D4F1FAA7D5C0008F7E0 /* SecDbKeychainSerializedItemV7.proto in Resources */ = {isa = PBXBuildFile; fileRef = 47922D4E1FAA7D5C0008F7E0 /* SecDbKeychainSerializedItemV7.proto */; };
+               47922D541FAA7E060008F7E0 /* SecDbKeychainSerializedItemV7.h in Headers */ = {isa = PBXBuildFile; fileRef = 47922D501FAA7DF60008F7E0 /* SecDbKeychainSerializedItemV7.h */; };
+               47922D551FAA7E070008F7E0 /* SecDbKeychainSerializedItemV7.h in Headers */ = {isa = PBXBuildFile; fileRef = 47922D501FAA7DF60008F7E0 /* SecDbKeychainSerializedItemV7.h */; };
+               47922D561FAA7E0D0008F7E0 /* SecDbKeychainSerializedItemV7.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D511FAA7DF70008F7E0 /* SecDbKeychainSerializedItemV7.m */; };
+               47922D571FAA7E0E0008F7E0 /* SecDbKeychainSerializedItemV7.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D511FAA7DF70008F7E0 /* SecDbKeychainSerializedItemV7.m */; };
                479DA1721EBBA8D10065C98F /* CKKSManifest.m in Sources */ = {isa = PBXBuildFile; fileRef = 47CEED1F1E60DE900044EAB4 /* CKKSManifest.m */; };
                479DA1781EBBA8D30065C98F /* CKKSManifest.m in Sources */ = {isa = PBXBuildFile; fileRef = 47CEED1F1E60DE900044EAB4 /* CKKSManifest.m */; };
+               47A05B161FDB5D9E00D0816E /* SFKeychainControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 47A05B101FDB5A8B00D0816E /* SFKeychainControl.h */; };
+               47A05B171FDB5D9F00D0816E /* SFKeychainControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 47A05B101FDB5A8B00D0816E /* SFKeychainControl.h */; };
+               47A05B181FDB5DBC00D0816E /* SFKeychainControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 47A05B101FDB5A8B00D0816E /* SFKeychainControl.h */; };
                47A0ABA81E6F7B24001B388C /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 474B5FBF1E662E21007546F8 /* SecurityFoundation.framework */; };
-               47B011971F17D7810030B49F /* SFObjCType.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BE1F152EB10082882F /* SFObjCType.m */; };
-               47B011981F17D78D0030B49F /* SFSQLite.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BC1F152EB10082882F /* SFSQLite.m */; };
                47B011991F17D78D0030B49F /* SFSQLiteStatement.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BF1F152EB10082882F /* SFSQLiteStatement.m */; };
-               47B0119A1F17D7E80030B49F /* SFObjCType.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BE1F152EB10082882F /* SFObjCType.m */; };
-               47B0119B1F17D7F10030B49F /* SFSQLite.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BC1F152EB10082882F /* SFSQLite.m */; };
-               47B0119C1F17D7F10030B49F /* SFSQLiteStatement.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BF1F152EB10082882F /* SFSQLiteStatement.m */; };
-               47B011A71F17D8980030B49F /* SFAnalyticsLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9DB1F1540CE0082882F /* SFAnalyticsLogger.m */; };
-               47B011AD1F17D8A00030B49F /* SFAnalyticsLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9DB1F1540CE0082882F /* SFAnalyticsLogger.m */; };
                47B90C901F350966006500BC /* CrashReporterSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E9391D7F3DF200AFB96E /* CrashReporterSupport.framework */; };
-               47B90C951F3509C1006500BC /* CrashReporterSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E9391D7F3DF200AFB96E /* CrashReporterSupport.framework */; };
                47C51B871EEA657D0032D9E5 /* SecurityUnitTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 47C51B861EEA657D0032D9E5 /* SecurityUnitTests.m */; };
                47C51B891EEA657D0032D9E5 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
                47D13F631E8447FB0063B6E2 /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E7C01D7A463E00AFB96E /* SecurityFoundation.framework */; };
+               47D183911FB3827800CFCD89 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47D1838B1FB3827700CFCD89 /* OCMock.framework */; };
+               47DE88DA1FA7B07400DD3254 /* server_xpc.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB2214A1E8B0861001598BC /* server_xpc.m */; };
                47E553741EDF674700749715 /* CKKSManifestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 476E918D1E7343B200B4E4D3 /* CKKSManifestTests.m */; };
                483E798F1DC87605005C0008 /* secd-67-prefixedKeyIDs.m in Sources */ = {isa = PBXBuildFile; fileRef = 483E79891DC875F2005C0008 /* secd-67-prefixedKeyIDs.m */; };
                48776C811DA5BC0E00CC09B9 /* SOSAccountRecovery.m in Sources */ = {isa = PBXBuildFile; fileRef = 48776C801DA5BC0E00CC09B9 /* SOSAccountRecovery.m */; };
-               48C2F9391E4BCFDA0093D70C /* accountCirclesViewsPrint.m in Sources */ = {isa = PBXBuildFile; fileRef = 48C2F9321E4BCFC30093D70C /* accountCirclesViewsPrint.m */; };
-               48C2F93A1E4BCFDC0093D70C /* accountCirclesViewsPrint.m in Sources */ = {isa = PBXBuildFile; fileRef = 48C2F9321E4BCFC30093D70C /* accountCirclesViewsPrint.m */; };
-               48C2F93B1E4BCFE80093D70C /* accountCirclesViewsPrint.m in Sources */ = {isa = PBXBuildFile; fileRef = 48C2F9321E4BCFC30093D70C /* accountCirclesViewsPrint.m */; };
-               48C2F93C1E4BD00F0093D70C /* accountCirclesViewsPrint.h in Headers */ = {isa = PBXBuildFile; fileRef = 48C2F9331E4BCFC30093D70C /* accountCirclesViewsPrint.h */; };
                48CC589F1DA5FF2700EBD9DB /* secd-66-account-recovery.m in Sources */ = {isa = PBXBuildFile; fileRef = 48CC58971DA5FF0B00EBD9DB /* secd-66-account-recovery.m */; };
                48E617211DBEC6BA0098EAAD /* SOSBackupInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = 48E6171A1DBEC40D0098EAAD /* SOSBackupInformation.m */; };
                48E617221DBEC6C60098EAAD /* SOSBackupInformation.h in Headers */ = {isa = PBXBuildFile; fileRef = 48E6171B1DBEC40D0098EAAD /* SOSBackupInformation.h */; };
-               4AF7000015AFB73800B9D400 /* SecOTRIdentityPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AF7FFF615AFB73800B9D400 /* SecOTRIdentityPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4AF7000115AFB73800B9D400 /* SecOTRMath.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AF7FFF715AFB73800B9D400 /* SecOTRMath.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4AF7000315AFB73800B9D400 /* SecOTRPacketData.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AF7FFF915AFB73800B9D400 /* SecOTRPacketData.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4AF7000415AFB73800B9D400 /* SecOTRPackets.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AF7FFFA15AFB73800B9D400 /* SecOTRPackets.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4AF7FFFD15AFB73800B9D400 /* SecOTR.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AF7FFF315AFB73800B9D400 /* SecOTR.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4AF7FFFE15AFB73800B9D400 /* SecOTRDHKey.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AF7FFF415AFB73800B9D400 /* SecOTRDHKey.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4AF7FFFF15AFB73800B9D400 /* SecOTRErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AF7FFF515AFB73800B9D400 /* SecOTRErrors.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               4C0B906E0ACCBD240077CD03 /* SecFramework.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0B906C0ACCBD240077CD03 /* SecFramework.h */; };
+               4C0B906E0ACCBD240077CD03 /* SecFramework.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0B906C0ACCBD240077CD03 /* SecFramework.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4C0CC642174C580200CC799A /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };
                4C12828D0BB4957D00985BB0 /* SecTrustSettingsPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C12828C0BB4957D00985BB0 /* SecTrustSettingsPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4C198F220ACDB4BF00AAB142 /* Certificate.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4C198F1D0ACDB4BF00AAB142 /* Certificate.strings */; };
                4C1B442D0BB9CAF900461B82 /* SecTrustStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C1B442C0BB9CAF900461B82 /* SecTrustStore.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4C2215220F3A612C00835155 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CB740680A4749C800D641BB /* libsqlite3.dylib */; };
                4C2F81D50BF121D2003C4F77 /* SecRandom.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C2F81D40BF121D2003C4F77 /* SecRandom.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               4C32C1030A4976BF002891BD /* certextensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C28BCD60986EBCB0020C665 /* certextensions.h */; };
+               4C32C1030A4976BF002891BD /* certextensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C28BCD60986EBCB0020C665 /* certextensions.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4C32C1240A4976BF002891BD /* SecBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C696B3709BFA94F000CBC75 /* SecBase.h */; settings = {ATTRIBUTES = (Public, ); }; };
                4C32C1250A4976BF002891BD /* SecCertificate.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C8FD03D099D5C91006867B6 /* SecCertificate.h */; settings = {ATTRIBUTES = (Public, ); }; };
                4C32C1260A4976BF002891BD /* SecTrust.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C8FD03E099D5C91006867B6 /* SecTrust.h */; settings = {ATTRIBUTES = (Public, ); }; };
                4CE5A66009C79E0600D27A3F /* ioSock.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CE5A65809C79E0600D27A3F /* ioSock.c */; };
                4CE5A66109C79E0600D27A3F /* sslAppUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE5A65A09C79E0600D27A3F /* sslAppUtils.cpp */; };
                4CE7EA791AEAF39C0067F5BD /* SecItemBackup.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CE7EA561AEAE8D60067F5BD /* SecItemBackup.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               4CEF4CA80C5551FE00062475 /* SecCertificateInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CEF4CA70C5551FE00062475 /* SecCertificateInternal.h */; };
+               4CEF4CA80C5551FE00062475 /* SecCertificateInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CEF4CA70C5551FE00062475 /* SecCertificateInternal.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4CF0484C0A5D988F00268236 /* SecItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CF0484A0A5D988F00268236 /* SecItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
                4CF048800A5F016300268236 /* SecItemPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CF0487F0A5F016300268236 /* SecItemPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               4CF41D0C0BBB4022005F3248 /* SecCertificatePath.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CF41D0A0BBB4022005F3248 /* SecCertificatePath.h */; };
                4CF4C19D171E0EA600877419 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF4C19C171E0EA600877419 /* Accounts.framework */; };
-               4CFBF6100D5A951100969BBE /* SecPolicyInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CFBF5F10D5A92E100969BBE /* SecPolicyInternal.h */; };
                52222CD0167BDAEC00EDD09C /* SpringBoardServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52222CC0167BDAE100EDD09C /* SpringBoardServices.framework */; };
                522B280E1E64B4BF002B5638 /* secd-230-keybagtable.m in Sources */ = {isa = PBXBuildFile; fileRef = 522B28081E64B48E002B5638 /* secd-230-keybagtable.m */; };
                524492941AFD6D480043695A /* der_plist.h in Headers */ = {isa = PBXBuildFile; fileRef = 524492931AFD6D480043695A /* der_plist.h */; settings = {ATTRIBUTES = (Private, ); }; };
                5E8B53A51AA0B8A600345E7B /* libcoreauthd_test_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E8B53A41AA0B8A600345E7B /* libcoreauthd_test_client.a */; };
                5EAFA4D31EF1605A002DC188 /* LocalAuthentication.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5EAFA4CD1EF16059002DC188 /* LocalAuthentication.framework */; };
                5EBE247D1B00CCAE0007DB0E /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 5EBE247C1B00CCAE0007DB0E /* main.c */; };
-               6C0B0C491E253832007F95E5 /* AwdMetadata-0x60-Keychain.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6C3446551E2534E800F9522B /* AwdMetadata-0x60-Keychain.bin */; };
                6C0B0C4B1E253848007F95E5 /* AwdMetadata-0x60-Keychain.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6C3446551E2534E800F9522B /* AwdMetadata-0x60-Keychain.bin */; };
+               6C1260FD1F7DA42D001B2EEC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
+               6C13AE471F8E9F5F00F047E3 /* supd.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C69517E1F758E1000F68F91 /* supd.m */; };
+               6C13AE481F8E9FC800F047E3 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                6C1520D41DCCF71400C85C6D /* secd.8 in Install man8 page */ = {isa = PBXBuildFile; fileRef = 6C1520CD1DCCF57A00C85C6D /* secd.8 */; };
                6C1F93111DD5E41A00585608 /* libDiagnosticMessagesClient.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC610A3C1D78F25C002223DE /* libDiagnosticMessagesClient.dylib */; };
                6C3446301E24F6BE00F9522B /* CKKSRateLimiterTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C34462F1E24F6BE00F9522B /* CKKSRateLimiterTests.m */; };
                6C3446461E25346C00F9522B /* CKKSRateLimiter.h in Headers */ = {isa = PBXBuildFile; fileRef = 6CC185971E24E87D009657D8 /* CKKSRateLimiter.h */; };
                6C3446471E25346C00F9522B /* CKKSRateLimiter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CC185981E24E87D009657D8 /* CKKSRateLimiter.m */; };
+               6C4605A51F882B9B001421B6 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
+               6C4605BC1F882DB6001421B6 /* SFAnalyticsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C1A29FC1F882788002312D8 /* SFAnalyticsTests.m */; };
+               6C4605BD1F882DC3001421B6 /* SupdTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C758CB01F8826100075BD78 /* SupdTests.m */; };
                6C588D7F1EAA14AA00D7E322 /* RateLimiterTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C588D791EAA149F00D7E322 /* RateLimiterTests.m */; };
                6C588D801EAA20AB00D7E322 /* RateLimiter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CC7F5B31E9F99EE0014AE63 /* RateLimiter.m */; };
                6C588D811EAA20AC00D7E322 /* RateLimiter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CC7F5B31E9F99EE0014AE63 /* RateLimiter.m */; };
                6C5B36BA1E2F9B95008AD443 /* WirelessDiagnostics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C0B0C3D1E2537C6007F95E5 /* WirelessDiagnostics.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                6C5B36C01E2F9BEA008AD443 /* WirelessDiagnostics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C0B0C3D1E2537C6007F95E5 /* WirelessDiagnostics.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+               6C73F48A2006B839003D5D63 /* SOSAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C7BB0032006B4EE004D1B6B /* SOSAnalytics.m */; };
+               6C73F48B2006B83A003D5D63 /* SOSAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C7BB0032006B4EE004D1B6B /* SOSAnalytics.m */; };
+               6C73F48C2006B83D003D5D63 /* SOSAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C7BB0032006B4EE004D1B6B /* SOSAnalytics.m */; };
+               6C73F48D2006B83E003D5D63 /* SOSAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C7BB0032006B4EE004D1B6B /* SOSAnalytics.m */; };
+               6C73F48F2006B910003D5D63 /* SOSAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C7BB0042006B4EF004D1B6B /* SOSAnalytics.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               6C73F4902006B911003D5D63 /* SOSAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C7BB0042006B4EF004D1B6B /* SOSAnalytics.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               6C7FD5DF1F87FA42002C2285 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
                6C869A751F50CAF400957298 /* SOSEnsureBackup.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C860C7A1F4F63DB004100A1 /* SOSEnsureBackup.m */; };
                6C869A761F50CAF500957298 /* SOSEnsureBackup.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C860C7A1F4F63DB004100A1 /* SOSEnsureBackup.m */; };
                6C869A791F54C37900957298 /* AWDKeychainSOSKeychainBackupFailed.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C869A771F54C2D700957298 /* AWDKeychainSOSKeychainBackupFailed.m */; };
                6C8CC3B41E2F913D009025C5 /* AWDKeychainCKKSRateLimiterOverload.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3446521E2534E800F9522B /* AWDKeychainCKKSRateLimiterOverload.m */; };
                6C8CC3B51E2F913D009025C5 /* AWDKeychainCKKSRateLimiterTopWriters.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3446541E2534E800F9522B /* AWDKeychainCKKSRateLimiterTopWriters.m */; };
                6C8CC3B61E2F98C2009025C5 /* ProtocolBuffer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C0B0C441E2537CC007F95E5 /* ProtocolBuffer.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+               6C8CE6C11FA248DA0032ADF0 /* SFAnalyticsActivityTracker+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C8CE6BB1FA248B50032ADF0 /* SFAnalyticsActivityTracker+Internal.h */; };
+               6C8CE6C21FA248DB0032ADF0 /* SFAnalyticsActivityTracker+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C8CE6BB1FA248B50032ADF0 /* SFAnalyticsActivityTracker+Internal.h */; };
                6C98083E1E788AEB00E70590 /* spi.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB01D8085D800865A7C /* spi.c */; };
-               6C9808491E788AEB00E70590 /* libDER_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC59E9EC1D91C9DC001BDDF5 /* libDER_not_installed.a */; };
                6C98084A1E788AEB00E70590 /* libASN1_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1_not_installed.a */; };
                6C98084C1E788AEB00E70590 /* libsecurityd_ios_NO_AKS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC222C771E034D1F00B09171 /* libsecurityd_ios_NO_AKS.a */; };
                6C98084D1E788AEB00E70590 /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
                6C98085B1E788AEB00E70590 /* libsqlite3.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC27B57D1DDFC24500599261 /* libsqlite3.0.dylib */; };
                6C98085C1E788AEB00E70590 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BE8ABDD71DC2DD9100EC2D58 /* libz.dylib */; };
                6C98087A1E788AFD00E70590 /* spi.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB01D8085D800865A7C /* spi.c */; };
-               6C9808851E788AFD00E70590 /* libDER_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC59E9EC1D91C9DC001BDDF5 /* libDER_not_installed.a */; };
                6C9808861E788AFD00E70590 /* libASN1_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1_not_installed.a */; };
                6C9808881E788AFD00E70590 /* libsecurityd_ios_NO_AKS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC222C771E034D1F00B09171 /* libsecurityd_ios_NO_AKS.a */; };
                6C9808891E788AFD00E70590 /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
                6C9808981E788AFD00E70590 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BE8ABDD71DC2DD9100EC2D58 /* libz.dylib */; };
                6C9808A51E788CD100E70590 /* CKKSCloudKitTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CCDF7911E3C2D69003F2555 /* CKKSCloudKitTests.m */; };
                6C9808A61E788CD200E70590 /* CKKSCloudKitTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CCDF7911E3C2D69003F2555 /* CKKSCloudKitTests.m */; };
+               6C9AA7A11F7C1D9000D08296 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C9AA7A01F7C1D9000D08296 /* main.m */; };
+               6C9AA7A51F7C6F7F00D08296 /* SecArgParse.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5BCC461E5380EA00649140 /* SecArgParse.c */; };
+               6CAA8CDD1F82EDEF007B6E03 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
+               6CAA8CEE1F83E417007B6E03 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
+               6CAA8CEF1F83E65D007B6E03 /* SFObjCType.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BE1F152EB10082882F /* SFObjCType.m */; };
+               6CAA8CF01F83E65E007B6E03 /* SFObjCType.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BE1F152EB10082882F /* SFObjCType.m */; };
+               6CAA8CF41F83E799007B6E03 /* SFSQLite.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BC1F152EB10082882F /* SFSQLite.m */; };
+               6CAA8CF61F83E79D007B6E03 /* SFSQLite.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BC1F152EB10082882F /* SFSQLite.m */; };
+               6CAA8CF71F83E79E007B6E03 /* SFSQLite.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BC1F152EB10082882F /* SFSQLite.m */; };
+               6CAA8CF81F83E7A9007B6E03 /* SFAnalyticsSQLiteStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C69518D1F75A7DB00F68F91 /* SFAnalyticsSQLiteStore.m */; };
+               6CAA8CF91F83E7AA007B6E03 /* SFAnalyticsSQLiteStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C69518D1F75A7DB00F68F91 /* SFAnalyticsSQLiteStore.m */; };
+               6CAA8CFA1F83E7AC007B6E03 /* SFAnalyticsSQLiteStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C69518D1F75A7DB00F68F91 /* SFAnalyticsSQLiteStore.m */; };
+               6CAA8CFC1F83E7EA007B6E03 /* SFObjCType.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BE1F152EB10082882F /* SFObjCType.m */; };
+               6CAA8CFD1F83E7EB007B6E03 /* SFObjCType.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BE1F152EB10082882F /* SFObjCType.m */; };
+               6CAA8CFE1F83E800007B6E03 /* SFSQLite.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BC1F152EB10082882F /* SFSQLite.m */; };
+               6CAA8CFF1F83E800007B6E03 /* SFSQLite.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BC1F152EB10082882F /* SFSQLite.m */; };
+               6CAA8D0D1F83EC57007B6E03 /* SFSQLiteStatement.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BF1F152EB10082882F /* SFSQLiteStatement.m */; };
+               6CAA8D131F83ECD4007B6E03 /* SFAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9DB1F1540CE0082882F /* SFAnalytics.m */; };
+               6CAA8D141F83ECD5007B6E03 /* SFAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9DB1F1540CE0082882F /* SFAnalytics.m */; };
+               6CAA8D151F83ECD9007B6E03 /* SFAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9DB1F1540CE0082882F /* SFAnalytics.m */; };
+               6CAA8D271F843002007B6E03 /* supd.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C69517E1F758E1000F68F91 /* supd.m */; };
+               6CAA8D351F84306C007B6E03 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C6951801F758E1000F68F91 /* main.m */; };
+               6CAA8D371F843196007B6E03 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
+               6CAA8D3A1F8431A7007B6E03 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
+               6CAA8D3B1F8431AE007B6E03 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D40B6A881E2B5F9900CD6EE5 /* Foundation.framework */; };
                6CAB39C71E521BEA00566A79 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                6CB5F47B1E402E6700DBF3F0 /* KeychainEntitledTestRunner.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CB5F47A1E402E5700DBF3F0 /* KeychainEntitledTestRunner.m */; };
+               6CB96BAC1F966D6500E11457 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C6951801F758E1000F68F91 /* main.m */; };
+               6CB96BB21F966DA400E11457 /* SFSQLite.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BC1F152EB10082882F /* SFSQLite.m */; };
+               6CB96BB31F966DA400E11457 /* SFSQLiteStatement.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BF1F152EB10082882F /* SFSQLiteStatement.m */; };
+               6CB96BB61F966E4300E11457 /* SFObjCType.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BE1F152EB10082882F /* SFObjCType.m */; };
+               6CBF65391FA147E500A68667 /* SFAnalyticsActivityTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 6CBF65371FA147E500A68667 /* SFAnalyticsActivityTracker.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               6CBF653A1FA147E500A68667 /* SFAnalyticsActivityTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CBF65381FA147E500A68667 /* SFAnalyticsActivityTracker.m */; };
+               6CBF65401FA1480C00A68667 /* SFAnalyticsActivityTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 6CBF65371FA147E500A68667 /* SFAnalyticsActivityTracker.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               6CBF65411FA1481100A68667 /* SFAnalyticsActivityTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CBF65381FA147E500A68667 /* SFAnalyticsActivityTracker.m */; };
+               6CBF65421FA2255800A68667 /* SFAnalyticsActivityTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CBF65381FA147E500A68667 /* SFAnalyticsActivityTracker.m */; };
+               6CBF65431FA2257100A68667 /* SFAnalyticsActivityTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CBF65381FA147E500A68667 /* SFAnalyticsActivityTracker.m */; };
+               6CBF65441FA2257200A68667 /* SFAnalyticsActivityTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CBF65381FA147E500A68667 /* SFAnalyticsActivityTracker.m */; };
+               6CBF65451FA2257500A68667 /* SFAnalyticsActivityTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CBF65381FA147E500A68667 /* SFAnalyticsActivityTracker.m */; };
                6CC1859E1E24E8EB009657D8 /* CKKSRateLimiter.h in Headers */ = {isa = PBXBuildFile; fileRef = 6CC185971E24E87D009657D8 /* CKKSRateLimiter.h */; };
                6CC1859F1E24E8EB009657D8 /* CKKSRateLimiter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CC185981E24E87D009657D8 /* CKKSRateLimiter.m */; };
+               6CC952481FB4CB2C0051A823 /* SFAnalytics+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 6CC952421FB4C5CA0051A823 /* SFAnalytics+Internal.h */; };
+               6CC952491FB4CB2D0051A823 /* SFAnalytics+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 6CC952421FB4C5CA0051A823 /* SFAnalytics+Internal.h */; };
                6CCDF78C1E3C26BC003F2555 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CCDF78B1E3C26BC003F2555 /* XCTest.framework */; };
                6CCDF78D1E3C26C2003F2555 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D40B6A881E2B5F9900CD6EE5 /* Foundation.framework */; };
+               6CDB5FF51FA78D1A00410924 /* SFAnalyticsMultiSampler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CDB5FED1FA78CB400410924 /* SFAnalyticsMultiSampler.m */; };
+               6CDB5FF61FA78D1B00410924 /* SFAnalyticsMultiSampler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CDB5FED1FA78CB400410924 /* SFAnalyticsMultiSampler.m */; };
+               6CDB5FF71FA78D2100410924 /* SFAnalyticsMultiSampler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CDB5FED1FA78CB400410924 /* SFAnalyticsMultiSampler.m */; };
+               6CDB5FF81FA78D2300410924 /* SFAnalyticsMultiSampler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CDB5FED1FA78CB400410924 /* SFAnalyticsMultiSampler.m */; };
+               6CDB5FF91FA78D2400410924 /* SFAnalyticsMultiSampler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CDB5FED1FA78CB400410924 /* SFAnalyticsMultiSampler.m */; };
+               6CDB5FFA1FA78D2500410924 /* SFAnalyticsMultiSampler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CDB5FED1FA78CB400410924 /* SFAnalyticsMultiSampler.m */; };
+               6CDB5FFB1FA78D2C00410924 /* SFAnalyticsMultiSampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 6CDB5FF41FA78CB500410924 /* SFAnalyticsMultiSampler.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               6CDB5FFC1FA78D2D00410924 /* SFAnalyticsMultiSampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 6CDB5FF41FA78CB500410924 /* SFAnalyticsMultiSampler.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               6CDB600F1FA92D2B00410924 /* securityuploadd.8 in Copy Manpage */ = {isa = PBXBuildFile; fileRef = 6C5B10211F9164F5009B091E /* securityuploadd.8 */; };
+               6CDB60111FA9386200410924 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
+               6CDB601A1FA93A1800410924 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CB96BB41F966E0C00E11457 /* libsqlite3.tbd */; };
+               6CDB601B1FA93A2000410924 /* libprequelite.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CFDC4561F907E1D00646DBB /* libprequelite.tbd */; };
+               6CDF8DEF1F96495600140B54 /* SFAnalyticsSampler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CDF8DE61F95562B00140B54 /* SFAnalyticsSampler.m */; };
+               6CDF8DF01F96495700140B54 /* SFAnalyticsSampler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CDF8DE61F95562B00140B54 /* SFAnalyticsSampler.m */; };
+               6CDF8DF11F96498300140B54 /* SFAnalyticsSampler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CDF8DE61F95562B00140B54 /* SFAnalyticsSampler.m */; };
+               6CDF8DF21F9649AB00140B54 /* SFAnalyticsSampler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CDF8DE61F95562B00140B54 /* SFAnalyticsSampler.m */; };
+               6CDF8DF31F9649C000140B54 /* SFAnalyticsSQLiteStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C69518D1F75A7DB00F68F91 /* SFAnalyticsSQLiteStore.m */; };
+               6CDF8DF41F9649C000140B54 /* SFAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9DB1F1540CE0082882F /* SFAnalytics.m */; };
                6CE22D701E49206600974785 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CE22D6F1E49206600974785 /* UIKit.framework */; };
+               6CE3654B1FA100D00012F6AB /* SFAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 4723C9DA1F1540CE0082882F /* SFAnalytics.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               6CE3654C1FA100D10012F6AB /* SFAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 4723C9DA1F1540CE0082882F /* SFAnalytics.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               6CE3654D1FA100E50012F6AB /* SFAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9DB1F1540CE0082882F /* SFAnalytics.m */; };
+               6CE3654E1FA100E50012F6AB /* SFAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9DB1F1540CE0082882F /* SFAnalytics.m */; };
+               6CE3654F1FA100F10012F6AB /* SFAnalyticsDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C69518F1F75A8C100F68F91 /* SFAnalyticsDefines.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               6CE365501FA100F20012F6AB /* SFAnalyticsDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C69518F1F75A8C100F68F91 /* SFAnalyticsDefines.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               6CE365511FA100FE0012F6AB /* SFAnalyticsSampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 6CDF8DE51F95562B00140B54 /* SFAnalyticsSampler.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               6CE365521FA100FF0012F6AB /* SFAnalyticsSampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 6CDF8DE51F95562B00140B54 /* SFAnalyticsSampler.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               6CE365531FA101080012F6AB /* SFAnalyticsSampler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CDF8DE61F95562B00140B54 /* SFAnalyticsSampler.m */; };
+               6CE365541FA101090012F6AB /* SFAnalyticsSampler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CDF8DE61F95562B00140B54 /* SFAnalyticsSampler.m */; };
+               6CE365551FA101730012F6AB /* SFAnalyticsSQLiteStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C69518E1F75A7DC00F68F91 /* SFAnalyticsSQLiteStore.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               6CE365561FA101740012F6AB /* SFAnalyticsSQLiteStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C69518E1F75A7DC00F68F91 /* SFAnalyticsSQLiteStore.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               6CE365571FA1017D0012F6AB /* SFAnalyticsSQLiteStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C69518D1F75A7DB00F68F91 /* SFAnalyticsSQLiteStore.m */; };
+               6CE365581FA1017E0012F6AB /* SFAnalyticsSQLiteStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C69518D1F75A7DB00F68F91 /* SFAnalyticsSQLiteStore.m */; };
                6CF4A0B81E45488B00ECD7B5 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CF4A0B71E45488B00ECD7B5 /* AppDelegate.m */; };
                6CF4A0BB1E45488B00ECD7B5 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CF4A0BA1E45488B00ECD7B5 /* main.m */; };
                6CF4A0BE1E45488B00ECD7B5 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CF4A0BD1E45488B00ECD7B5 /* ViewController.m */; };
                6CF4A0ED1E4549F300ECD7B5 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6CF4A0EB1E4549F300ECD7B5 /* Main.storyboard */; };
                6CF4A0EF1E4549F300ECD7B5 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6CF4A0EE1E4549F300ECD7B5 /* Assets.xcassets */; };
                6CF4A0F21E4549F300ECD7B5 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6CF4A0F01E4549F300ECD7B5 /* LaunchScreen.storyboard */; };
+               6CFDC4551F907D2600646DBB /* SFObjCType.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BE1F152EB10082882F /* SFObjCType.m */; };
                7200D76F177B9999009BB396 /* ManagedConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 72C3EC2D1705F24E0040C87C /* ManagedConfiguration.framework */; };
                724340BA1ED3FEC800F8F566 /* SecSMIME.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17870D1D778FA900B50D50 /* SecSMIME.h */; settings = {ATTRIBUTES = (Private, ); }; };
                7281E0871DFD01800021E1B7 /* SOSAccountGetSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 7281E0861DFD015A0021E1B7 /* SOSAccountGetSet.m */; };
                7281E0901DFD0E0A0021E1B7 /* CKDKVSProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = E7A5F4C71C0CFF3200F3BEBB /* CKDKVSProxy.m */; };
                7281E0911DFD0E510021E1B7 /* CKDSimulatedStore.m in Sources */ = {isa = PBXBuildFile; fileRef = E7FE40C41DC804E400F0F5B6 /* CKDSimulatedStore.m */; };
                7281E0971DFD0FD00021E1B7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
-               728B56A216D59979008FA3AB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
-               72C3EC2E1705F24E0040C87C /* ManagedConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 72C3EC2D1705F24E0040C87C /* ManagedConfiguration.framework */; };
-               72CD2BBE16D59AE30064EEE1 /* OTAServiceApp.m in Sources */ = {isa = PBXBuildFile; fileRef = 72CD2BBB16D59AE30064EEE1 /* OTAServiceApp.m */; };
-               72CD2BBF16D59AE30064EEE1 /* OTAServicemain.m in Sources */ = {isa = PBXBuildFile; fileRef = 72CD2BBD16D59AE30064EEE1 /* OTAServicemain.m */; };
-               72CD2BCD16D59AF30064EEE1 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
-               72CD2BCE16D59B010064EEE1 /* MobileAsset.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7273402816CAFB3C0096622A /* MobileAsset.framework */; };
                72CDF5131EC679A4002D233B /* sec_action.h in Headers */ = {isa = PBXBuildFile; fileRef = 7221843F1EC6782A004C7BED /* sec_action.h */; };
                72CDF5191EC679A8002D233B /* sec_action.c in Sources */ = {isa = PBXBuildFile; fileRef = 7221843E1EC6782A004C7BED /* sec_action.c */; };
-               72DF9EFE178360230054641E /* libMobileGestalt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E7D690911652E06A0079537A /* libMobileGestalt.dylib */; };
                78F92F11195128D70023B54B /* SecECKeyPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 78F92F10195128D70023B54B /* SecECKeyPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                7901791812D51F7200CA4D44 /* SecCmsBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 7901790E12D51F7200CA4D44 /* SecCmsBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
                7901791912D51F7200CA4D44 /* SecCmsContentInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 7901790F12D51F7200CA4D44 /* SecCmsContentInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BE197F5C1911724900BA91D1 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE411314471B000DE34E /* UIKit.framework */; };
                BE197F5E191173A800BA91D1 /* SWCViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BE197F5D191173A800BA91D1 /* SWCViewController.m */; };
                BE197F61191173F200BA91D1 /* entitlements.plist in Resources */ = {isa = PBXBuildFile; fileRef = BE197F60191173F200BA91D1 /* entitlements.plist */; };
+               BE1F74D31F609D460068FA64 /* SecFramework.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E4F1D8085FC00865A7C /* SecFramework.c */; };
                BE22FBC61EE0E8AB00893431 /* Monkey.m in Sources */ = {isa = PBXBuildFile; fileRef = BE22FBC51EE0E8AB00893431 /* Monkey.m */; };
                BE22FBCE1EE1E26600893431 /* Keychain.m in Sources */ = {isa = PBXBuildFile; fileRef = BE22FBCD1EE1E26600893431 /* Keychain.m */; };
                BE22FBD11EE2084100893431 /* Config.m in Sources */ = {isa = PBXBuildFile; fileRef = BE22FBD01EE2084100893431 /* Config.m */; };
                BE22FC041EE3584400893431 /* mark.m in Sources */ = {isa = PBXBuildFile; fileRef = BE22FBFC1EE23D9100893431 /* mark.m */; };
                BE25C41618B83491003320E0 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
+               BE2AD2B31FDA07EF00739F96 /* OTBottledPeerRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = BE2AD2B11FDA07EF00739F96 /* OTBottledPeerRecord.h */; };
+               BE2AD2BA1FDA080800739F96 /* OTBottledPeerRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = BE2AD2B21FDA07EF00739F96 /* OTBottledPeerRecord.m */; };
+               BE2AD2BB1FDA080900739F96 /* OTBottledPeerRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = BE2AD2B21FDA07EF00739F96 /* OTBottledPeerRecord.m */; };
+               BE3405AC1FD7258900933DAC /* OTBottle.proto in Sources */ = {isa = PBXBuildFile; fileRef = BE3405A11FD71CC800933DAC /* OTBottle.proto */; };
+               BE3405AD1FD725A700933DAC /* OTBottleContents.proto in Sources */ = {isa = PBXBuildFile; fileRef = BE3405A51FD720C900933DAC /* OTBottleContents.proto */; };
+               BE3405AE1FD725EC00933DAC /* OTBottle.proto in Sources */ = {isa = PBXBuildFile; fileRef = BE3405A11FD71CC800933DAC /* OTBottle.proto */; };
+               BE3405AF1FD725F000933DAC /* OTBottleContents.proto in Sources */ = {isa = PBXBuildFile; fileRef = BE3405A51FD720C900933DAC /* OTBottleContents.proto */; };
                BE405EE21DC2F10E00E227B1 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BE8ABDD71DC2DD9100EC2D58 /* libz.dylib */; };
                BE405EE31DC2F11E00E227B1 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BE8ABDD71DC2DD9100EC2D58 /* libz.dylib */; };
                BE442BAE18B7FDB800F24DAE /* libMobileGestalt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E7D690911652E06A0079537A /* libMobileGestalt.dylib */; };
                BE6215BE1DB6E69100961E15 /* si-84-sectrust-allowlist.m in Sources */ = {isa = PBXBuildFile; fileRef = BE6215BD1DB6E69100961E15 /* si-84-sectrust-allowlist.m */; };
                BE759DCB1917E38D00801E02 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE451314471B000DE34E /* CoreGraphics.framework */; };
                BE8ABDD81DC2DD9100EC2D58 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BE8ABDD71DC2DD9100EC2D58 /* libz.dylib */; };
+               BEA74211202525CD00EC7993 /* si-88-sectrust-valid-data in Resources */ = {isa = PBXBuildFile; fileRef = BEB9EA2E1FFF1AF600676593 /* si-88-sectrust-valid-data */; };
+               BEA74217202525DC00EC7993 /* si-88-sectrust-valid-data in Resources */ = {isa = PBXBuildFile; fileRef = BEB9EA2E1FFF1AF600676593 /* si-88-sectrust-valid-data */; };
+               BEB0B0D71FFC3D9A007E6A83 /* OTPrivateKey.proto in Sources */ = {isa = PBXBuildFile; fileRef = BEB0B0CE1FFC37E3007E6A83 /* OTPrivateKey.proto */; };
+               BEB0B0D81FFC3DD3007E6A83 /* OTPrivateKey.proto in Sources */ = {isa = PBXBuildFile; fileRef = BEB0B0CE1FFC37E3007E6A83 /* OTPrivateKey.proto */; };
+               BEB0B0DB1FFC45C2007E6A83 /* OTPrivateKey+SF.h in Headers */ = {isa = PBXBuildFile; fileRef = BEB0B0D91FFC45C2007E6A83 /* OTPrivateKey+SF.h */; };
+               BEB0B0DD1FFC45D7007E6A83 /* OTPrivateKey+SF.m in Sources */ = {isa = PBXBuildFile; fileRef = BEB0B0DA1FFC45C2007E6A83 /* OTPrivateKey+SF.m */; };
+               BEB0B0DE1FFC45D8007E6A83 /* OTPrivateKey+SF.m in Sources */ = {isa = PBXBuildFile; fileRef = BEB0B0DA1FFC45C2007E6A83 /* OTPrivateKey+SF.m */; };
+               BEB9E9EC1FFF195C00676593 /* si-88-sectrust-valid.m in Sources */ = {isa = PBXBuildFile; fileRef = BEB9E9E51FFF193D00676593 /* si-88-sectrust-valid.m */; };
+               BEB9EA2F1FFF1AF700676593 /* si-88-sectrust-valid-data in Resources */ = {isa = PBXBuildFile; fileRef = BEB9EA2E1FFF1AF600676593 /* si-88-sectrust-valid-data */; };
+               BEB9EA301FFF1B0800676593 /* si-88-sectrust-valid-data in Resources */ = {isa = PBXBuildFile; fileRef = BEB9EA2E1FFF1AF600676593 /* si-88-sectrust-valid-data */; };
                BED208D81EDF950E00753952 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };
                BED208D91EDF950E00753952 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                BED208E81EDF974500753952 /* manifeststresstest.m in Sources */ = {isa = PBXBuildFile; fileRef = BED208E71EDF971600753952 /* manifeststresstest.m */; };
+               BEE4B18C1FFD585800777D39 /* OTAuthenticatedCiphertext.proto in Sources */ = {isa = PBXBuildFile; fileRef = BEE4B1861FFD57D800777D39 /* OTAuthenticatedCiphertext.proto */; };
+               BEE4B18D1FFD588000777D39 /* OTAuthenticatedCiphertext.proto in Sources */ = {isa = PBXBuildFile; fileRef = BEE4B1861FFD57D800777D39 /* OTAuthenticatedCiphertext.proto */; };
+               BEE4B1921FFD604B00777D39 /* OTAuthenticatedCiphertext+SF.h in Headers */ = {isa = PBXBuildFile; fileRef = BEE4B1901FFD604B00777D39 /* OTAuthenticatedCiphertext+SF.h */; };
+               BEE4B1931FFD604B00777D39 /* OTAuthenticatedCiphertext+SF.h in Headers */ = {isa = PBXBuildFile; fileRef = BEE4B1901FFD604B00777D39 /* OTAuthenticatedCiphertext+SF.h */; };
+               BEE4B1941FFD604B00777D39 /* OTAuthenticatedCiphertext+SF.m in Sources */ = {isa = PBXBuildFile; fileRef = BEE4B1911FFD604B00777D39 /* OTAuthenticatedCiphertext+SF.m */; };
+               BEE4B1951FFD604B00777D39 /* OTAuthenticatedCiphertext+SF.m in Sources */ = {isa = PBXBuildFile; fileRef = BEE4B1911FFD604B00777D39 /* OTAuthenticatedCiphertext+SF.m */; };
+               BEE4B1981FFDAFE600777D39 /* SFPublicKey+SPKI.h in Headers */ = {isa = PBXBuildFile; fileRef = BEE4B1961FFDAFE600777D39 /* SFPublicKey+SPKI.h */; };
+               BEE4B1991FFDAFE600777D39 /* SFPublicKey+SPKI.h in Headers */ = {isa = PBXBuildFile; fileRef = BEE4B1961FFDAFE600777D39 /* SFPublicKey+SPKI.h */; };
+               BEE4B19A1FFDAFE600777D39 /* SFECPublicKey+SPKI.m in Sources */ = {isa = PBXBuildFile; fileRef = BEE4B1971FFDAFE600777D39 /* SFECPublicKey+SPKI.m */; };
+               BEE4B19B1FFDAFE600777D39 /* SFECPublicKey+SPKI.m in Sources */ = {isa = PBXBuildFile; fileRef = BEE4B1971FFDAFE600777D39 /* SFECPublicKey+SPKI.m */; };
                BEE523D91DACAA2500DD0AA3 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789221D7799A600B50D50 /* libz.dylib */; };
                BEE523DC1DACAA9200DD0AA3 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789221D7799A600B50D50 /* libz.dylib */; };
                BEEB47D91EA189F5004AA5C6 /* SecTrustStatusCodes.c in Sources */ = {isa = PBXBuildFile; fileRef = BEEB47D71EA189F5004AA5C6 /* SecTrustStatusCodes.c */; };
                D4096E011ED5F0B5000AC459 /* si-60-cms.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DD81D8085FC00865A7C /* si-60-cms.c */; };
                D4096E021ED5F207000AC459 /* si-64-ossl-cms.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DE71D8085FC00865A7C /* si-64-ossl-cms.c */; };
                D4096E031ED5F21C000AC459 /* si-65-cms-cert-policy.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DE81D8085FC00865A7C /* si-65-cms-cert-policy.c */; };
-               D40B6A821E2B5F5600CD6EE5 /* libDER_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC59E9EC1D91C9DC001BDDF5 /* libDER_not_installed.a */; };
                D40B6A831E2B5F5B00CD6EE5 /* libASN1_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1_not_installed.a */; };
                D40B6A8D1E2B63D900CD6EE5 /* libtrustd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4ADA3191E2B41670031CEA3 /* libtrustd.a */; };
                D40B6A8E1E2B643500CD6EE5 /* libtrustd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4ADA3191E2B41670031CEA3 /* libtrustd.a */; };
                D40B6A9B1E2B690E00CD6EE5 /* SecuritydXPC.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E9A1D8085FC00865A7C /* SecuritydXPC.c */; };
                D40B6A9D1E2B6A2700CD6EE5 /* login.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E8271D7A4F0E00AFB96E /* login.framework */; };
                D40B6A9E1E2B6A6F00CD6EE5 /* libtrustd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4ADA3191E2B41670031CEA3 /* libtrustd.a */; };
+               D4119E78202BDF490048587B /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D4119E72202BDF2B0048587B /* libz.tbd */; };
+               D4119E79202BDF580048587B /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D4119E72202BDF2B0048587B /* libz.tbd */; };
+               D4119E882032A8FA0048587B /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47D1838B1FB3827700CFCD89 /* OCMock.framework */; };
                D41257D01E9410A300781F23 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D40B6A881E2B5F9900CD6EE5 /* Foundation.framework */; };
                D41257D91E9412B800781F23 /* trustd.c in Sources */ = {isa = PBXBuildFile; fileRef = D4BEECE61E93093A00F76D1A /* trustd.c */; };
                D41257DA1E9412DC00781F23 /* libtrustd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4ADA3191E2B41670031CEA3 /* libtrustd.a */; };
                D41257DB1E9412E700781F23 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
-               D41257DC1E94130C00781F23 /* libDER_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC59E9EC1D91C9DC001BDDF5 /* libDER_not_installed.a */; };
                D41257DE1E94132900781F23 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CB740680A4749C800D641BB /* libsqlite3.dylib */; };
                D41257DF1E94133600781F23 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF730310EF9CDE300E17471 /* CFNetwork.framework */; };
                D41257E01E94136000781F23 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BE8ABDD71DC2DD9100EC2D58 /* libz.dylib */; };
                D43B88721E72298500F86F19 /* MobileAsset.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7273402816CAFB3C0096622A /* MobileAsset.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                D43DBEFB1E99D1CA00C04AEA /* asynchttp.c in Sources */ = {isa = PBXBuildFile; fileRef = D43DBED51E99D17100C04AEA /* asynchttp.c */; };
                D43DBEFC1E99D1CA00C04AEA /* nameconstraints.c in Sources */ = {isa = PBXBuildFile; fileRef = D43DBED71E99D17100C04AEA /* nameconstraints.c */; };
-               D43DBEFD1E99D1CA00C04AEA /* OTATrustUtilities.c in Sources */ = {isa = PBXBuildFile; fileRef = D43DBED91E99D17100C04AEA /* OTATrustUtilities.c */; };
+               D43DBEFD1E99D1CA00C04AEA /* OTATrustUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = D43DBED91E99D17100C04AEA /* OTATrustUtilities.m */; };
                D43DBEFE1E99D1CA00C04AEA /* personalization.c in Sources */ = {isa = PBXBuildFile; fileRef = D43DBEDB1E99D17100C04AEA /* personalization.c */; };
                D43DBEFF1E99D1CA00C04AEA /* policytree.c in Sources */ = {isa = PBXBuildFile; fileRef = D43DBEDD1E99D17100C04AEA /* policytree.c */; };
                D43DBF001E99D1CA00C04AEA /* SecCAIssuerCache.c in Sources */ = {isa = PBXBuildFile; fileRef = D43DBEDF1E99D17200C04AEA /* SecCAIssuerCache.c */; };
                D43DBF081E99D1CA00C04AEA /* SecPolicyServer.c in Sources */ = {isa = PBXBuildFile; fileRef = D43DBEEF1E99D17300C04AEA /* SecPolicyServer.c */; };
                D43DBF091E99D1CA00C04AEA /* SecRevocationDb.c in Sources */ = {isa = PBXBuildFile; fileRef = D43DBEF11E99D17300C04AEA /* SecRevocationDb.c */; };
                D43DBF0A1E99D1CA00C04AEA /* SecRevocationServer.c in Sources */ = {isa = PBXBuildFile; fileRef = D43DBEF31E99D17300C04AEA /* SecRevocationServer.c */; };
-               D43DBF0B1E99D1CA00C04AEA /* SecTrustLoggingServer.c in Sources */ = {isa = PBXBuildFile; fileRef = D43DBEF51E99D17300C04AEA /* SecTrustLoggingServer.c */; };
+               D43DBF0B1E99D1CA00C04AEA /* SecTrustLoggingServer.m in Sources */ = {isa = PBXBuildFile; fileRef = D43DBEF51E99D17300C04AEA /* SecTrustLoggingServer.m */; };
                D43DBF0C1E99D1CA00C04AEA /* SecTrustServer.c in Sources */ = {isa = PBXBuildFile; fileRef = D43DBEF71E99D17300C04AEA /* SecTrustServer.c */; };
                D43DBF0D1E99D1CA00C04AEA /* SecTrustStoreServer.c in Sources */ = {isa = PBXBuildFile; fileRef = D43DBEF91E99D17300C04AEA /* SecTrustStoreServer.c */; };
                D447C4101D3094740082FC1D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
                D450686A1E948D2200FA7675 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
+               D453C3901FEC66AE00DE349B /* trust_update.m in Sources */ = {isa = PBXBuildFile; fileRef = D453C38A1FEC669300DE349B /* trust_update.m */; };
+               D4574AA0203E618B006D9B82 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF4C19C171E0EA600877419 /* Accounts.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+               D4574AA1203E6893006D9B82 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF4C19C171E0EA600877419 /* Accounts.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+               D4574AA2203E68C8006D9B82 /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A94C6D4203CC2590066E391 /* AuthKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+               D4574AA3203E68E0006D9B82 /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A94C6D4203CC2590066E391 /* AuthKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                D45917E41DC13E6700752D25 /* SecCertificateRequest.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E3E1D8085FC00865A7C /* SecCertificateRequest.c */; };
                D459A1781E9FFE60009ED74B /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E9411D7F3E6E00AFB96E /* CoreCDP.framework */; };
+               D46246971F9AE2E400D63882 /* libDER.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D46246911F9AE2E400D63882 /* libDER.a */; };
+               D46246A31F9AE59E00D63882 /* oids.h in Headers */ = {isa = PBXBuildFile; fileRef = D46246A21F9AE49E00D63882 /* oids.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D46246A61F9AE61000D63882 /* oids.c in Sources */ = {isa = PBXBuildFile; fileRef = D462469C1F9AE45900D63882 /* oids.c */; };
+               D46246A71F9AE62000D63882 /* oids.c in Sources */ = {isa = PBXBuildFile; fileRef = D462469C1F9AE45900D63882 /* oids.c */; };
+               D46246A81F9AE64000D63882 /* oids.h in Headers */ = {isa = PBXBuildFile; fileRef = D46246A21F9AE49E00D63882 /* oids.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               D46246AA1F9AE6CA00D63882 /* libDER.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D46246A91F9AE6C900D63882 /* libDER.a */; };
+               D46246B51F9AE74000D63882 /* libDER.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D46246AF1F9AE73F00D63882 /* libDER.a */; };
+               D46246B61F9AE75100D63882 /* libDER.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D46246AF1F9AE73F00D63882 /* libDER.a */; };
+               D46246B71F9AE76500D63882 /* libDER.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D46246AF1F9AE73F00D63882 /* libDER.a */; };
+               D46246B81F9AE77900D63882 /* libDER.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D46246AF1F9AE73F00D63882 /* libDER.a */; };
+               D46246B91F9AE79000D63882 /* libDER.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D46246AF1F9AE73F00D63882 /* libDER.a */; };
+               D46246BA1F9AE7A000D63882 /* libDER.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D46246AF1F9AE73F00D63882 /* libDER.a */; };
+               D46246BB1F9AE7B300D63882 /* libDER.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D46246AF1F9AE73F00D63882 /* libDER.a */; };
+               D46246BC1F9AE82B00D63882 /* libDER.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D46246AF1F9AE73F00D63882 /* libDER.a */; };
+               D46246BD1F9AE83600D63882 /* libDER.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D46246AF1F9AE73F00D63882 /* libDER.a */; };
+               D46246BE1F9AE86400D63882 /* libDER.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D46246AF1F9AE73F00D63882 /* libDER.a */; };
+               D46246C91F9AEA5300D63882 /* libDER.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D46246C31F9AEA5200D63882 /* libDER.a */; };
+               D46246D41F9AEAE300D63882 /* libDER.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D46246CE1F9AEAE300D63882 /* libDER.a */; };
+               D46246D91F9AED5D00D63882 /* libDER.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D46246CE1F9AEAE300D63882 /* libDER.a */; };
+               D479F6E21F980FAB00388D28 /* Trust.strings in Resources */ = {isa = PBXBuildFile; fileRef = D479F6DF1F980F8F00388D28 /* Trust.strings */; };
+               D479F6E31F981FD600388D28 /* OID.strings in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4C198F1F0ACDB4BF00AAB142 /* OID.strings */; };
+               D479F6E41F981FD600388D28 /* Certificate.strings in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4C198F1D0ACDB4BF00AAB142 /* Certificate.strings */; };
+               D479F6E51F981FD600388D28 /* Trust.strings in CopyFiles */ = {isa = PBXBuildFile; fileRef = D479F6DF1F980F8F00388D28 /* Trust.strings */; };
                D47CA65D1EB036450038E2BB /* libMobileGestalt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D47CA65C1EB036450038E2BB /* libMobileGestalt.dylib */; };
                D47E69401E92F75D002C8CF6 /* si-61-pkcs12.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DD91D8085FC00865A7C /* si-61-pkcs12.c */; };
                D47F514C1C3B812500A7CEFE /* SecCFAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = D47F514B1C3B812500A7CEFE /* SecCFAllocator.h */; settings = {ATTRIBUTES = (Private, ); }; };
                D487B9881DFA2902000410A1 /* SecInternalReleasePriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC771D8C68CF00070CB0 /* SecInternalReleasePriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                D487FBB81DB8357300D4BB0B /* si-29-sectrust-sha1-deprecation.m in Sources */ = {isa = PBXBuildFile; fileRef = D487FBB71DB8357300D4BB0B /* si-29-sectrust-sha1-deprecation.m */; };
                D487FBBA1DB835B500D4BB0B /* si-29-sectrust-sha1-deprecation.h in Headers */ = {isa = PBXBuildFile; fileRef = D487FBB91DB835B500D4BB0B /* si-29-sectrust-sha1-deprecation.h */; };
-               D48E4E241E42F0620011B4BA /* si-62-csr.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DDA1D8085FC00865A7C /* si-62-csr.c */; };
+               D48E4E241E42F0620011B4BA /* si-62-csr.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DDA1D8085FC00865A7C /* si-62-csr.m */; };
                D4AA64361E95D92600D317ED /* com.apple.trustd.sb in Copy Sandbox */ = {isa = PBXBuildFile; fileRef = D41257EB1E941CF200781F23 /* com.apple.trustd.sb */; };
                D4AA643C1E95D93100D317ED /* com.apple.trustd.plist in Copy LaunchDaemon Files */ = {isa = PBXBuildFile; fileRef = D41257EA1E941CF200781F23 /* com.apple.trustd.plist */; };
                D4AA643D1E95D93900D317ED /* com.apple.trustd.agent.plist in Copy LaunchAgent */ = {isa = PBXBuildFile; fileRef = D41257E91E941CF200781F23 /* com.apple.trustd.agent.plist */; };
                D4ADA3311E2B43450031CEA3 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF730310EF9CDE300E17471 /* CFNetwork.framework */; };
                D4B858671D370D9A003B2D95 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4B858661D370D9A003B2D95 /* MobileCoreServices.framework */; };
                D4BEECE81E93094500F76D1A /* trustd.c in Sources */ = {isa = PBXBuildFile; fileRef = D4BEECE61E93093A00F76D1A /* trustd.c */; };
+               D4C263CE1F95300F001317EA /* SecErrorMessages.strings in Resources */ = {isa = PBXBuildFile; fileRef = D4C263CC1F952F6C001317EA /* SecErrorMessages.strings */; };
+               D4C263CF1F953019001317EA /* SecDebugErrorMessages.strings in Resources */ = {isa = PBXBuildFile; fileRef = D4C263C81F952E64001317EA /* SecDebugErrorMessages.strings */; };
+               D4C6C5C81FB2AD5E007EA57E /* si-87-sectrust-name-constraints in Resources */ = {isa = PBXBuildFile; fileRef = D4C6C5C71FB2AD3F007EA57E /* si-87-sectrust-name-constraints */; };
+               D4C6C5C91FB2AD6D007EA57E /* si-87-sectrust-name-constraints in Resources */ = {isa = PBXBuildFile; fileRef = D4C6C5C71FB2AD3F007EA57E /* si-87-sectrust-name-constraints */; };
+               D4C6C5CA1FB2AD7A007EA57E /* si-87-sectrust-name-constraints in Resources */ = {isa = PBXBuildFile; fileRef = D4C6C5C71FB2AD3F007EA57E /* si-87-sectrust-name-constraints */; };
+               D4C6C5CD1FB3B423007EA57E /* libarchive.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D4C6C5CB1FB3B3CC007EA57E /* libarchive.tbd */; };
+               D4C6C5CF1FB3B44D007EA57E /* libarchive.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D4C6C5CE1FB3B44C007EA57E /* libarchive.2.dylib */; };
+               D4C6C5D01FB3B45E007EA57E /* libarchive.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D4C6C5CE1FB3B44C007EA57E /* libarchive.2.dylib */; };
                D4C7CD661E71E92D00139817 /* MobileAsset.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7273402816CAFB3C0096622A /* MobileAsset.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                D4CFAA7E1E660BB3004746AA /* si-32-sectrust-pinning-required.m in Sources */ = {isa = PBXBuildFile; fileRef = D4CFAA7D1E660BB3004746AA /* si-32-sectrust-pinning-required.m */; };
                D4D718351E04A721000AE7A6 /* spbkdf-01-hmac-sha256.c in Sources */ = {isa = PBXBuildFile; fileRef = D4D718341E04A721000AE7A6 /* spbkdf-01-hmac-sha256.c */; };
                D4EC94FE1CEA48760083E753 /* si-20-sectrust-policies-data in Resources */ = {isa = PBXBuildFile; fileRef = D4EC94FA1CEA482D0083E753 /* si-20-sectrust-policies-data */; };
                D4FBBD621DD661A7004408F7 /* CMSEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = D4FBBD601DD66196004408F7 /* CMSEncoder.h */; settings = {ATTRIBUTES = (Private, ); }; };
                D4FBBD631DD661AD004408F7 /* CMSDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = D4FBBD611DD66196004408F7 /* CMSDecoder.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               DA19DAEF1FCFA420008E82EE /* CKKSControl.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9C95B31F79CFD1000D19E5 /* CKKSControl.m */; };
+               DA19DAF01FCFA425008E82EE /* CKKSControlProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = DCF7A8A21F0450EB00CABE89 /* CKKSControlProtocol.m */; };
                DA30D6851DF8CA4100EC6B43 /* KeychainSyncAccountUpdater.m in Sources */ = {isa = PBXBuildFile; fileRef = DA30D6841DF8CA4100EC6B43 /* KeychainSyncAccountUpdater.m */; };
+               DA6AA1651FE88AFB004565B0 /* CKKSControlServer.m in Sources */ = {isa = PBXBuildFile; fileRef = DA6AA15E1FE88AF9004565B0 /* CKKSControlServer.m */; };
+               DA6AA1661FE88AFB004565B0 /* CKKSControlServer.m in Sources */ = {isa = PBXBuildFile; fileRef = DA6AA15E1FE88AF9004565B0 /* CKKSControlServer.m */; };
+               DA6AA1671FE88AFB004565B0 /* CKKSControlServer.h in Headers */ = {isa = PBXBuildFile; fileRef = DA6AA1641FE88AFA004565B0 /* CKKSControlServer.h */; };
+               DA6AA1681FE88AFB004565B0 /* CKKSControlServer.h in Headers */ = {isa = PBXBuildFile; fileRef = DA6AA1641FE88AFA004565B0 /* CKKSControlServer.h */; };
+               DAB27AE11FA29EE300DEBBDE /* SOSControlServer.m in Sources */ = {isa = PBXBuildFile; fileRef = DAB27AE01FA29EB800DEBBDE /* SOSControlServer.m */; };
+               DAEE055C1FAD3FC700DF27F3 /* AutoreleaseTest.c in Sources */ = {isa = PBXBuildFile; fileRef = DAEE05551FAD3FC500DF27F3 /* AutoreleaseTest.c */; };
                DC0067C11D87879D005AF8DB /* ucspServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC6A82811D87734600418608 /* ucspServer.cpp */; };
                DC0067C21D8787A4005AF8DB /* ucspNotifyReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC6A82831D87734600418608 /* ucspNotifyReceiver.cpp */; };
                DC0067D11D8788B7005AF8DB /* ucspClientC.c in Sources */ = {isa = PBXBuildFile; fileRef = DC6A82801D87734600418608 /* ucspClientC.c */; };
                DC0BC6611D8B755200070CB0 /* ckutilities.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC6131D8B755200070CB0 /* ckutilities.c */; };
                DC0BC6621D8B755200070CB0 /* ckutilities.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6141D8B755200070CB0 /* ckutilities.h */; };
                DC0BC6631D8B755200070CB0 /* Crypt.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6151D8B755200070CB0 /* Crypt.h */; };
-               DC0BC6641D8B755200070CB0 /* CryptKitSA.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6161D8B755200070CB0 /* CryptKitSA.h */; };
-               DC0BC6651D8B755200070CB0 /* CryptKit.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6171D8B755200070CB0 /* CryptKit.h */; };
                DC0BC6661D8B755200070CB0 /* CryptKitAsn1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC6181D8B755200070CB0 /* CryptKitAsn1.cpp */; };
                DC0BC6671D8B755200070CB0 /* CryptKitAsn1.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6191D8B755200070CB0 /* CryptKitAsn1.h */; };
                DC0BC6681D8B755200070CB0 /* CryptKitDER.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC61A1D8B755200070CB0 /* CryptKitDER.cpp */; };
                DC0BCDB51D8C6A5B00070CB0 /* not_on_this_platorm.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCDB41D8C6A5B00070CB0 /* not_on_this_platorm.c */; };
                DC1002AF1D8E18870025549C /* libsecurity_codesigning.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD0677F1D8CDF19007602F1 /* libsecurity_codesigning.a */; };
                DC1002D81D8E1A670025549C /* SecTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 107226D10D91DB32003CF14F /* SecTask.h */; };
+               DC124DCD20059BA900BE8DAC /* OctagonControlServer.m in Sources */ = {isa = PBXBuildFile; fileRef = DC124DC220059B8700BE8DAC /* OctagonControlServer.m */; };
+               DC124DCE20059BA900BE8DAC /* OctagonControlServer.m in Sources */ = {isa = PBXBuildFile; fileRef = DC124DC220059B8700BE8DAC /* OctagonControlServer.m */; };
+               DC14478A1F5764C600236DB4 /* CKKSResultOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1447881F5764C600236DB4 /* CKKSResultOperation.h */; };
+               DC14478B1F5764C600236DB4 /* CKKSResultOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1447881F5764C600236DB4 /* CKKSResultOperation.h */; };
+               DC14478C1F5764C600236DB4 /* CKKSResultOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC1447891F5764C600236DB4 /* CKKSResultOperation.m */; };
+               DC14478D1F5764C600236DB4 /* CKKSResultOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC1447891F5764C600236DB4 /* CKKSResultOperation.m */; };
+               DC1447961F5766D200236DB4 /* NSOperationCategories.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1447941F5766D200236DB4 /* NSOperationCategories.h */; };
+               DC1447971F5766D200236DB4 /* NSOperationCategories.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1447941F5766D200236DB4 /* NSOperationCategories.h */; };
+               DC1447981F5766D200236DB4 /* NSOperationCategories.m in Sources */ = {isa = PBXBuildFile; fileRef = DC1447951F5766D200236DB4 /* NSOperationCategories.m */; };
+               DC1447991F5766D200236DB4 /* NSOperationCategories.m in Sources */ = {isa = PBXBuildFile; fileRef = DC1447951F5766D200236DB4 /* NSOperationCategories.m */; };
                DC15F7661E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC15F7641E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.h */; };
                DC15F7671E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC15F7641E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.h */; };
                DC15F7681E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC15F7651E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.m */; };
                DC17853C1D778A3100B50D50 /* mds_schema.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17853A1D778A3100B50D50 /* mds_schema.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC17853D1D778A3100B50D50 /* mds.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17853B1D778A3100B50D50 /* mds.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC1785401D778A4E00B50D50 /* SecureDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17853F1D778A4E00B50D50 /* SecureDownload.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC1785431D778A7400B50D50 /* oids.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785421D778A7400B50D50 /* oids.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC17854E1D778ACD00B50D50 /* SecAccess.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785451D778ACD00B50D50 /* SecAccess.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC17854F1D778ACD00B50D50 /* SecACL.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785461D778ACD00B50D50 /* SecACL.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC1785501D778ACD00B50D50 /* SecCertificateOIDs.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785471D778ACD00B50D50 /* SecCertificateOIDs.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC1785871D778B8000B50D50 /* CodeSigning.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785811D778B7F00B50D50 /* CodeSigning.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC1785881D778B8000B50D50 /* CSCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785821D778B7F00B50D50 /* CSCommon.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC1785891D778B8000B50D50 /* SecCode.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785831D778B7F00B50D50 /* SecCode.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC17858A1D778B8000B50D50 /* SecCodeHost.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785841D778B8000B50D50 /* SecCodeHost.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC17858B1D778B8000B50D50 /* SecRequirement.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785851D778B8000B50D50 /* SecRequirement.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC17858C1D778B8000B50D50 /* SecStaticCode.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785861D778B8000B50D50 /* SecStaticCode.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC1785901D778B9D00B50D50 /* CMSDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17858E1D778B9D00B50D50 /* CMSDecoder.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC17871D1D778FAA00B50D50 /* SecCmsSignerInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17870C1D778FA900B50D50 /* SecCmsSignerInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC17871E1D778FAA00B50D50 /* SecSMIME.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17870D1D778FA900B50D50 /* SecSMIME.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC17871F1D778FAA00B50D50 /* tsaSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17870E1D778FA900B50D50 /* tsaSupport.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               DC1787201D778FAA00B50D50 /* tsaSupportPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17870F1D778FA900B50D50 /* tsaSupportPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               DC1787211D778FAA00B50D50 /* tsaTemplates.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787101D778FA900B50D50 /* tsaTemplates.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1787231D778FC900B50D50 /* mdspriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787221D778FC900B50D50 /* mdspriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1787261D778FDE00B50D50 /* SecManifest.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787241D778FDE00B50D50 /* SecManifest.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1787271D778FDE00B50D50 /* SecureDownloadInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787251D778FDE00B50D50 /* SecureDownloadInternal.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1787431D77906C00B50D50 /* cssmapplePriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787421D77906C00B50D50 /* cssmapplePriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC17874E1D7790A500B50D50 /* CSCommonPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787441D7790A500B50D50 /* CSCommonPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC17874F1D7790A500B50D50 /* SecAssessment.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787451D7790A500B50D50 /* SecAssessment.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               DC1787501D7790A500B50D50 /* SecCodeHostLib.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787461D7790A500B50D50 /* SecCodeHostLib.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1787511D7790A500B50D50 /* SecCodePriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787471D7790A500B50D50 /* SecCodePriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1787521D7790A500B50D50 /* SecCodeSigner.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787481D7790A500B50D50 /* SecCodeSigner.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1787551D7790A500B50D50 /* SecRequirementPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17874B1D7790A500B50D50 /* SecRequirementPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC222C3B1E034D1F00B09171 /* SOSChangeTracker.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D4F1D8085F200865A7C /* SOSChangeTracker.c */; };
                DC222C3D1E034D1F00B09171 /* SOSEngine.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D561D8085F200865A7C /* SOSEngine.c */; };
                DC222C401E034D1F00B09171 /* SecDbItem.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C8E1D8085D800865A7C /* SecDbItem.c */; };
-               DC222C411E034D1F00B09171 /* SecDbKeychainItem.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C901D8085D800865A7C /* SecDbKeychainItem.c */; };
+               DC222C411E034D1F00B09171 /* SecDbKeychainItem.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C901D8085D800865A7C /* SecDbKeychainItem.m */; };
                DC222C421E034D1F00B09171 /* SecDbQuery.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C921D8085D800865A7C /* SecDbQuery.c */; };
                DC222C431E034D1F00B09171 /* SecItemBackupServer.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C9C1D8085D800865A7C /* SecItemBackupServer.c */; };
                DC222C441E034D1F00B09171 /* SecItemDataSource.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C941D8085D800865A7C /* SecItemDataSource.c */; };
                DC2353311ECA658B00D7C1BE /* server_security_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.c */; };
                DC2353321ECA659000D7C1BE /* server_xpc.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB2214A1E8B0861001598BC /* server_xpc.m */; };
                DC2353331ECA659000D7C1BE /* server_xpc.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB2214A1E8B0861001598BC /* server_xpc.m */; };
+               DC2670F21F3E6EC500816EED /* debugging.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC531D8C68CF00070CB0 /* debugging.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               DC2670F51F3E711400816EED /* SOSAccountCloudParameters.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D1A1D8085F200865A7C /* SOSAccountCloudParameters.m */; };
+               DC2670F61F3E714000816EED /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };
+               DC2670F71F3E721800816EED /* SOSAccountTrustClassic.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C48991B1E0F384700C6CF70 /* SOSAccountTrustClassic.m */; };
+               DC2670F81F3E723B00816EED /* SOSAccountDer.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D1C1D8085F200865A7C /* SOSAccountDer.m */; };
+               DC2670FB1F3E72C000816EED /* SOSCircleDer.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D351D8085F200865A7C /* SOSCircleDer.c */; };
+               DC2670FC1F3E72C400816EED /* SOSCircleDer.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D341D8085F200865A7C /* SOSCircleDer.h */; };
+               DC2671001F3E766E00816EED /* SecOTRSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AF7FFFB15AFB73800B9D400 /* SecOTRSession.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               DC2671071F3E8A0900816EED /* SecECKey.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CD3BA601106FF4D00BE8B75 /* SecECKey.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               DC26710E1F3E932D00816EED /* libASN1_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1_not_installed.a */; };
                DC2C5F4B1F0D935200FEBDA7 /* CKKSControlProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF7A89F1F04502300CABE89 /* CKKSControlProtocol.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC2C5F511F0D935300FEBDA7 /* CKKSControlProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF7A89F1F04502300CABE89 /* CKKSControlProtocol.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC2C5F5D1F0EB97E00FEBDA7 /* CKKSNotifier.h in Headers */ = {isa = PBXBuildFile; fileRef = DC2C5F5A1F0EB97E00FEBDA7 /* CKKSNotifier.h */; };
                DC2C5F611F0EB97E00FEBDA7 /* CKKSNotifier.m in Sources */ = {isa = PBXBuildFile; fileRef = DC2C5F5B1F0EB97E00FEBDA7 /* CKKSNotifier.m */; };
                DC2D438F1F0EEC2A0005D382 /* MockCloudKit.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3502E61E0214C800BC0587 /* MockCloudKit.m */; };
                DC2D43951F0EEC300005D382 /* MockCloudKit.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3502E61E0214C800BC0587 /* MockCloudKit.m */; };
+               DC337B1F1EA04E2100B3A1F0 /* SecBase64.h in Headers */ = {isa = PBXBuildFile; fileRef = 18351B8F14CB65870097860E /* SecBase64.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC3502B81E0208BE00BC0587 /* CKKSTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3502B71E0208BE00BC0587 /* CKKSTests.m */; };
                DC3502C51E020D5100BC0587 /* libASN1_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1_not_installed.a */; };
-               DC3502C81E020D5B00BC0587 /* libDER_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC59E9EC1D91C9DC001BDDF5 /* libDER_not_installed.a */; };
                DC3502CA1E020DC100BC0587 /* libsqlite3.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC27B57D1DDFC24500599261 /* libsqlite3.0.dylib */; };
                DC3502CF1E020E2900BC0587 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DC3502D21E02113900BC0587 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
                DC378B391DEFADB500A3DAFA /* CKKSZoneStateEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = DC378B371DEFADB500A3DAFA /* CKKSZoneStateEntry.m */; };
                DC378B3C1DF0CA7200A3DAFA /* CKKSIncomingQueueEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = DC378B3A1DF0CA7200A3DAFA /* CKKSIncomingQueueEntry.h */; };
                DC378B3D1DF0CA7200A3DAFA /* CKKSIncomingQueueEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = DC378B3B1DF0CA7200A3DAFA /* CKKSIncomingQueueEntry.m */; };
-               DC3832DA1DB7050900385F63 /* module.modulemap in Headers */ = {isa = PBXBuildFile; fileRef = DC3832C01DB6E69800385F63 /* module.modulemap */; settings = {ATTRIBUTES = (Public, ); }; };
                DC3A4B4B1D91E30400E46D4A /* sec_xdr.h in Headers */ = {isa = PBXBuildFile; fileRef = DC6A825A1D87732E00418608 /* sec_xdr.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC3A4B531D91E8EB00E46D4A /* libsecurity_utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD06AB01D8E0D53007602F1 /* libsecurity_utilities.a */; };
                DC3A4B641D91EADC00E46D4A /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC3A4B621D91EAC500E46D4A /* main.cpp */; };
                DC3A81D71D99D58A000C7419 /* libcoretls_cfhelpers.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC3A81D41D99D567000C7419 /* libcoretls_cfhelpers.dylib */; };
                DC3A81EC1D99F568000C7419 /* libcoretls.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CFC029B1D41650700E6283B /* libcoretls.dylib */; };
                DC3C72E21D8374D600F6A832 /* SecureTransportPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1786FD1D778F5000B50D50 /* SecureTransportPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               DC3C72E31D8376D700F6A832 /* SOSTypes.h in Copy SecurityObjectSync Headers */ = {isa = PBXBuildFile; fileRef = DCC78D8F1D8085F200865A7C /* SOSTypes.h */; };
-               DC3C72E41D8376DE00F6A832 /* SOSBackupSliceKeyBag.h in Copy SecurityObjectSync Headers */ = {isa = PBXBuildFile; fileRef = DCC78D2A1D8085F200865A7C /* SOSBackupSliceKeyBag.h */; };
-               DC3C72E51D8376E600F6A832 /* SOSCloudCircle.h in Copy SecurityObjectSync Headers */ = {isa = PBXBuildFile; fileRef = DCC78D8A1D8085F200865A7C /* SOSCloudCircle.h */; };
-               DC3C72E61D8376EC00F6A832 /* SOSCloudCircleInternal.h in Copy SecurityObjectSync Headers */ = {isa = PBXBuildFile; fileRef = DCC78D8B1D8085F200865A7C /* SOSCloudCircleInternal.h */; };
-               DC3C72E71D8376F300F6A832 /* SOSPeerInfo.h in Copy SecurityObjectSync Headers */ = {isa = PBXBuildFile; fileRef = DCC78D641D8085F200865A7C /* SOSPeerInfo.h */; };
-               DC3C72E81D8376F900F6A832 /* SOSViews.h in Copy SecurityObjectSync Headers */ = {isa = PBXBuildFile; fileRef = DCC78D4B1D8085F200865A7C /* SOSViews.h */; };
                DC3C72E91D83776B00F6A832 /* SOSBackupSliceKeyBag.h in Copy SecureObjectSync Headers */ = {isa = PBXBuildFile; fileRef = DCC78D2A1D8085F200865A7C /* SOSBackupSliceKeyBag.h */; };
-               DC3C72EA1D83777100F6A832 /* SOSPeerInfoV2.h in Copy SecureObjectSync Headers */ = {isa = PBXBuildFile; fileRef = DCC78D681D8085F200865A7C /* SOSPeerInfoV2.h */; };
                DC3C72EB1D83777600F6A832 /* SOSCloudCircle.h in Copy SecureObjectSync Headers */ = {isa = PBXBuildFile; fileRef = DCC78D8A1D8085F200865A7C /* SOSCloudCircle.h */; };
                DC3C72EC1D83777B00F6A832 /* SOSPeerInfo.h in Copy SecureObjectSync Headers */ = {isa = PBXBuildFile; fileRef = DCC78D641D8085F200865A7C /* SOSPeerInfo.h */; };
                DC3C72ED1D83778100F6A832 /* SOSViews.h in Copy SecureObjectSync Headers */ = {isa = PBXBuildFile; fileRef = DCC78D4B1D8085F200865A7C /* SOSViews.h */; };
                DC3C7AB61D838C2D00F6A832 /* SecAsn1Types.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785151D77895A00B50D50 /* SecAsn1Types.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC3C7AB71D838C5C00F6A832 /* secasn1t.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787681D77911D00B50D50 /* secasn1t.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC3C7AB81D838C6F00F6A832 /* oidsalg.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785111D77895A00B50D50 /* oidsalg.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               DC3C7AB91D838C8D00F6A832 /* oids.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785421D778A7400B50D50 /* oids.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC3C7ABA1D838C9F00F6A832 /* sslTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1786FB1D778F3C00B50D50 /* sslTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC3C7C901D83957F00F6A832 /* NSFileHandle+Formatting.m in Sources */ = {isa = PBXBuildFile; fileRef = E78A9AD91D34959200006B5B /* NSFileHandle+Formatting.m */; };
+               DC3D748C1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC3D748A1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.h */; };
+               DC3D748D1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC3D748A1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.h */; };
+               DC3D748E1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3D748B1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.m */; };
+               DC3D748F1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3D748B1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.m */; };
                DC4268F61E82036F002B7110 /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
                DC4268FC1E820370002B7110 /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
                DC4268FE1E820371002B7110 /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
                DC4DB1511E24692100CD6769 /* CKKSKey.h in Headers */ = {isa = PBXBuildFile; fileRef = DC4DB14E1E24692100CD6769 /* CKKSKey.h */; };
                DC4DB1521E24692100CD6769 /* CKKSKey.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4DB14F1E24692100CD6769 /* CKKSKey.m */; };
                DC4DB1531E24692100CD6769 /* CKKSKey.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4DB14F1E24692100CD6769 /* CKKSKey.m */; };
-               DC4DB15F1E2590B100CD6769 /* CKKSEncryptionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4DB15E1E2590B100CD6769 /* CKKSEncryptionTests.m */; };
+               DC4DB15F1E2590B100CD6769 /* CKKSAESSIVEncryptionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4DB15E1E2590B100CD6769 /* CKKSAESSIVEncryptionTests.m */; };
                DC4DB1691E26E99E00CD6769 /* ProtocolBuffer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C0B0C441E2537CC007F95E5 /* ProtocolBuffer.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                DC4DB16A1E26E9F900CD6769 /* ProtocolBuffer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C0B0C441E2537CC007F95E5 /* ProtocolBuffer.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                DC4EA5961E70A237008840B4 /* libsecurity.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCC78EA91D8088E200865A7C /* libsecurity.a */; };
                DC52E7CC1D80BCDF00B0A59C /* SecDbQuery.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C921D8085D800865A7C /* SecDbQuery.c */; };
                DC52E7CD1D80BCE700B0A59C /* SecItemDataSource.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C941D8085D800865A7C /* SecItemDataSource.c */; };
                DC52E7CF1D80BCFD00B0A59C /* SOSEngine.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D561D8085F200865A7C /* SOSEngine.c */; };
-               DC52E7D31D80BD1800B0A59C /* SecDbKeychainItem.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C901D8085D800865A7C /* SecDbKeychainItem.c */; };
+               DC52E7D31D80BD1800B0A59C /* SecDbKeychainItem.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C901D8085D800865A7C /* SecDbKeychainItem.m */; };
                DC52E7D41D80BD1D00B0A59C /* iCloudTrace.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB31D8085D800865A7C /* iCloudTrace.c */; };
                DC52E7D61D80BD2800B0A59C /* SecuritydXPC.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E9A1D8085FC00865A7C /* SecuritydXPC.c */; };
                DC52E7D71D80BD2D00B0A59C /* SecItemServer.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C9A1D8085D800865A7C /* SecItemServer.c */; };
                DC52ECBD1D80D22600B0A59C /* si-42-identity.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DD11D8085FC00865A7C /* si-42-identity.c */; };
                DC52ECBE1D80D22600B0A59C /* si-43-persistent.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DD21D8085FC00865A7C /* si-43-persistent.c */; };
                DC52ECC31D80D22600B0A59C /* si-50-secrandom.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DD71D8085FC00865A7C /* si-50-secrandom.c */; };
-               DC52ECC71D80D22600B0A59C /* si-63-scep.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DDE1D8085FC00865A7C /* si-63-scep.c */; };
+               DC52ECC71D80D22600B0A59C /* si-63-scep.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DDE1D8085FC00865A7C /* si-63-scep.m */; };
                DC52ECCD1D80D22600B0A59C /* si-69-keydesc.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DF91D8085FC00865A7C /* si-69-keydesc.c */; };
                DC52ECD01D80D22600B0A59C /* si-72-syncableitems.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DFC1D8085FC00865A7C /* si-72-syncableitems.c */; };
                DC52ECD11D80D22600B0A59C /* si-73-secpasswordgenerate.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DFD1D8085FC00865A7C /* si-73-secpasswordgenerate.c */; };
                DC52ECD51D80D22600B0A59C /* si-78-query-attrs.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E011D8085FC00865A7C /* si-78-query-attrs.c */; };
                DC52ECD61D80D22600B0A59C /* si-80-empty-data.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E021D8085FC00865A7C /* si-80-empty-data.c */; };
                DC52ECD91D80D22600B0A59C /* si-82-token-ag.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E051D8085FC00865A7C /* si-82-token-ag.c */; };
-               DC52ECDD1D80D22600B0A59C /* si-89-cms-hash-agility.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E0B1D8085FC00865A7C /* si-89-cms-hash-agility.c */; };
+               DC52ECDD1D80D22600B0A59C /* si-89-cms-hash-agility.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E0B1D8085FC00865A7C /* si-89-cms-hash-agility.m */; };
                DC52ECDE1D80D22600B0A59C /* si-90-emcs.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E0D1D8085FC00865A7C /* si-90-emcs.m */; };
                DC52ECDF1D80D22600B0A59C /* si-95-cms-basic.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E0E1D8085FC00865A7C /* si-95-cms-basic.c */; };
                DC52ECE11D80D2F000B0A59C /* otr-00-identity.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DA71D8085FC00865A7C /* otr-00-identity.c */; };
                DC58C43E1D77BED0003C25A4 /* csparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC58C43B1D77BED0003C25A4 /* csparser.cpp */; };
                DC59E9A41D91C6F0001BDDF5 /* libCMS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1002D71D8E19F20025549C /* libCMS.a */; };
                DC59E9A71D91C7C7001BDDF5 /* libCMS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1002D71D8E19F20025549C /* libCMS.a */; };
-               DC59E9FE1D91CA0A001BDDF5 /* DER_Keys.c in Sources */ = {isa = PBXBuildFile; fileRef = DC59E9ED1D91CA0A001BDDF5 /* DER_Keys.c */; };
-               DC59EA011D91CA0A001BDDF5 /* DER_CertCrl.c in Sources */ = {isa = PBXBuildFile; fileRef = DC59E9F01D91CA0A001BDDF5 /* DER_CertCrl.c */; };
-               DC59EA031D91CA0A001BDDF5 /* DER_Decode.c in Sources */ = {isa = PBXBuildFile; fileRef = DC59E9F21D91CA0A001BDDF5 /* DER_Decode.c */; };
-               DC59EA051D91CA0A001BDDF5 /* DER_Encode.c in Sources */ = {isa = PBXBuildFile; fileRef = DC59E9F41D91CA0A001BDDF5 /* DER_Encode.c */; };
-               DC59EA0A1D91CA0A001BDDF5 /* DER_Digest.c in Sources */ = {isa = PBXBuildFile; fileRef = DC59E9F91D91CA0A001BDDF5 /* DER_Digest.c */; };
-               DC59EA0B1D91CA0A001BDDF5 /* oids.c in Sources */ = {isa = PBXBuildFile; fileRef = DC59E9FA1D91CA0A001BDDF5 /* oids.c */; };
-               DC59EA2D1D91CA2C001BDDF5 /* libDERUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = DC59EA261D91CA2C001BDDF5 /* libDERUtils.h */; };
-               DC59EA2E1D91CA2C001BDDF5 /* libDERUtils.c in Sources */ = {isa = PBXBuildFile; fileRef = DC59EA271D91CA2C001BDDF5 /* libDERUtils.c */; };
-               DC59EA2F1D91CA2C001BDDF5 /* fileIo.c in Sources */ = {isa = PBXBuildFile; fileRef = DC59EA281D91CA2C001BDDF5 /* fileIo.c */; };
-               DC59EA301D91CA2C001BDDF5 /* fileIo.h in Headers */ = {isa = PBXBuildFile; fileRef = DC59EA291D91CA2C001BDDF5 /* fileIo.h */; };
-               DC59EA311D91CA2C001BDDF5 /* printFields.h in Headers */ = {isa = PBXBuildFile; fileRef = DC59EA2A1D91CA2C001BDDF5 /* printFields.h */; };
-               DC59EA321D91CA2C001BDDF5 /* printFields.c in Sources */ = {isa = PBXBuildFile; fileRef = DC59EA2B1D91CA2C001BDDF5 /* printFields.c */; };
-               DC59EA4E1D91CACE001BDDF5 /* parseCert.c in Sources */ = {isa = PBXBuildFile; fileRef = DC59EA491D91CACE001BDDF5 /* parseCert.c */; };
-               DC59EA501D91CAE3001BDDF5 /* libDER_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC59E9EC1D91C9DC001BDDF5 /* libDER_not_installed.a */; };
-               DC59EA511D91CAE8001BDDF5 /* libDERUtils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC59EA251D91CA15001BDDF5 /* libDERUtils.a */; };
-               DC59EA5A1D91CAF0001BDDF5 /* libDERUtils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC59EA251D91CA15001BDDF5 /* libDERUtils.a */; };
-               DC59EA5B1D91CAF0001BDDF5 /* libDER_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC59E9EC1D91C9DC001BDDF5 /* libDER_not_installed.a */; };
-               DC59EA611D91CAFD001BDDF5 /* parseCrl.c in Sources */ = {isa = PBXBuildFile; fileRef = DC59EA4A1D91CACE001BDDF5 /* parseCrl.c */; };
-               DC59EA6B1D91CB9F001BDDF5 /* libDER_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC59E9EC1D91C9DC001BDDF5 /* libDER_not_installed.a */; };
-               DC59EA711D91CBB9001BDDF5 /* DER_Ticket.c in Sources */ = {isa = PBXBuildFile; fileRef = DC59EA461D91CACE001BDDF5 /* DER_Ticket.c */; };
-               DC59EA721D91CBBD001BDDF5 /* parseTicket.c in Sources */ = {isa = PBXBuildFile; fileRef = DC59EA481D91CACE001BDDF5 /* parseTicket.c */; };
-               DC59EA741D91CBD0001BDDF5 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC59EA731D91CBD0001BDDF5 /* libcrypto.dylib */; };
-               DC59EA771D91CC6D001BDDF5 /* libDER_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC59E9EC1D91C9DC001BDDF5 /* libDER_not_installed.a */; };
-               DC59EA7B1D91CC9F001BDDF5 /* libDER_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC59E9EC1D91C9DC001BDDF5 /* libDER_not_installed.a */; };
-               DC59EA7E1D91CCB2001BDDF5 /* libDER_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC59E9EC1D91C9DC001BDDF5 /* libDER_not_installed.a */; };
-               DC59EA821D91CD24001BDDF5 /* libDER_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC59E9EC1D91C9DC001BDDF5 /* libDER_not_installed.a */; };
-               DC59EA851D91CD35001BDDF5 /* libDER_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC59E9EC1D91C9DC001BDDF5 /* libDER_not_installed.a */; };
-               DC59EA881D91CD7E001BDDF5 /* libDER_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC59E9EC1D91C9DC001BDDF5 /* libDER_not_installed.a */; };
-               DC59EA8B1D91CD93001BDDF5 /* libDER_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC59E9EC1D91C9DC001BDDF5 /* libDER_not_installed.a */; };
-               DC59EA8E1D91CDC1001BDDF5 /* libDER_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC59E9EC1D91C9DC001BDDF5 /* libDER_not_installed.a */; };
-               DC59EA911D91CDCF001BDDF5 /* libDER_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC59E9EC1D91C9DC001BDDF5 /* libDER_not_installed.a */; };
-               DC59EA941D91CDE0001BDDF5 /* libDER_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC59E9EC1D91C9DC001BDDF5 /* libDER_not_installed.a */; };
-               DC59EA971D91CDFA001BDDF5 /* libDER_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC59E9EC1D91C9DC001BDDF5 /* libDER_not_installed.a */; };
-               DC59EA9A1D91CE94001BDDF5 /* libDER_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC59E9EC1D91C9DC001BDDF5 /* libDER_not_installed.a */; };
                DC5ABDCC1D832E4000CF422C /* srCdsaUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABD781D832D5800CF422C /* srCdsaUtils.cpp */; };
                DC5ABDCD1D832E4000CF422C /* createFVMaster.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABD7A1D832D5800CF422C /* createFVMaster.c */; };
                DC5ABDCE1D832E4000CF422C /* mds_install.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABD7D1D832D5800CF422C /* mds_install.cpp */; };
                DC71D9D81D95BA6C0065FB93 /* secasn1d.c in Sources */ = {isa = PBXBuildFile; fileRef = DC88343A1D8A21AA00CE0ACA /* secasn1d.c */; };
                DC71D9D91D95BA6C0065FB93 /* SecAsn1Coder.c in Sources */ = {isa = PBXBuildFile; fileRef = DC88340A1D8A21AA00CE0ACA /* SecAsn1Coder.c */; };
                DC71D9DA1D95BA6C0065FB93 /* secasn1u.c in Sources */ = {isa = PBXBuildFile; fileRef = DC88343D1D8A21AA00CE0ACA /* secasn1u.c */; };
-               DC71D9E61D95BB0A0065FB93 /* oidsPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC59E9FC1D91CA0A001BDDF5 /* oidsPriv.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9E71D95BB0A0065FB93 /* libDER.h in Headers */ = {isa = PBXBuildFile; fileRef = DC59E9F71D91CA0A001BDDF5 /* libDER.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9E81D95BB0A0065FB93 /* DER_Decode.h in Headers */ = {isa = PBXBuildFile; fileRef = DC59E9F31D91CA0A001BDDF5 /* DER_Decode.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9E91D95BB0A0065FB93 /* DER_Keys.h in Headers */ = {isa = PBXBuildFile; fileRef = DC59E9EE1D91CA0A001BDDF5 /* DER_Keys.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9EA1D95BB0A0065FB93 /* DER_Encode.h in Headers */ = {isa = PBXBuildFile; fileRef = DC59E9F51D91CA0A001BDDF5 /* DER_Encode.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9EB1D95BB0A0065FB93 /* DER_Digest.h in Headers */ = {isa = PBXBuildFile; fileRef = DC59E9F81D91CA0A001BDDF5 /* DER_Digest.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9ED1D95BB0A0065FB93 /* asn1Types.h in Headers */ = {isa = PBXBuildFile; fileRef = DC59E9EF1D91CA0A001BDDF5 /* asn1Types.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9EE1D95BB0A0065FB93 /* libDER_config.h in Headers */ = {isa = PBXBuildFile; fileRef = DC59E9F61D91CA0A001BDDF5 /* libDER_config.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9EF1D95BB0A0065FB93 /* DER_CertCrl.h in Headers */ = {isa = PBXBuildFile; fileRef = DC59E9F11D91CA0A001BDDF5 /* DER_CertCrl.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9F11D95BB0A0065FB93 /* DER_Decode.c in Sources */ = {isa = PBXBuildFile; fileRef = DC59E9F21D91CA0A001BDDF5 /* DER_Decode.c */; };
-               DC71D9F21D95BB0A0065FB93 /* DER_Encode.c in Sources */ = {isa = PBXBuildFile; fileRef = DC59E9F41D91CA0A001BDDF5 /* DER_Encode.c */; };
-               DC71D9F31D95BB0A0065FB93 /* DER_Keys.c in Sources */ = {isa = PBXBuildFile; fileRef = DC59E9ED1D91CA0A001BDDF5 /* DER_Keys.c */; };
-               DC71D9F41D95BB0A0065FB93 /* DER_Digest.c in Sources */ = {isa = PBXBuildFile; fileRef = DC59E9F91D91CA0A001BDDF5 /* DER_Digest.c */; };
-               DC71D9F51D95BB0A0065FB93 /* oids.c in Sources */ = {isa = PBXBuildFile; fileRef = DC59E9FA1D91CA0A001BDDF5 /* oids.c */; };
-               DC71D9F61D95BB0A0065FB93 /* DER_CertCrl.c in Sources */ = {isa = PBXBuildFile; fileRef = DC59E9F01D91CA0A001BDDF5 /* DER_CertCrl.c */; };
+               DC7341F31F8447AB00AB9BDF /* CKKSTLKShare.h in Headers */ = {isa = PBXBuildFile; fileRef = DC7341F11F8447AB00AB9BDF /* CKKSTLKShare.h */; };
+               DC7341F41F8447AB00AB9BDF /* CKKSTLKShare.h in Headers */ = {isa = PBXBuildFile; fileRef = DC7341F11F8447AB00AB9BDF /* CKKSTLKShare.h */; };
+               DC7341F51F8447AB00AB9BDF /* CKKSTLKShare.m in Sources */ = {isa = PBXBuildFile; fileRef = DC7341F21F8447AB00AB9BDF /* CKKSTLKShare.m */; };
+               DC7341F61F8447AB00AB9BDF /* CKKSTLKShare.m in Sources */ = {isa = PBXBuildFile; fileRef = DC7341F21F8447AB00AB9BDF /* CKKSTLKShare.m */; };
+               DC7341FE1F84642C00AB9BDF /* CKKSTLKSharingEncryptionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DC7341FD1F84642C00AB9BDF /* CKKSTLKSharingEncryptionTests.m */; };
                DC762A9E1E57A86A00B03A2C /* CKKSRecordHolder.h in Headers */ = {isa = PBXBuildFile; fileRef = DC762A9C1E57A86A00B03A2C /* CKKSRecordHolder.h */; };
                DC762A9F1E57A86A00B03A2C /* CKKSRecordHolder.h in Headers */ = {isa = PBXBuildFile; fileRef = DC762A9C1E57A86A00B03A2C /* CKKSRecordHolder.h */; };
                DC762AA01E57A86A00B03A2C /* CKKSRecordHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = DC762A9D1E57A86A00B03A2C /* CKKSRecordHolder.m */; };
                DC8834911D8A21AB00CE0ACA /* oidsalg.c in Sources */ = {isa = PBXBuildFile; fileRef = DC8834491D8A21AA00CE0ACA /* oidsalg.c */; };
                DC8834931D8A21AB00CE0ACA /* oidsattr.c in Sources */ = {isa = PBXBuildFile; fileRef = DC88344B1D8A21AA00CE0ACA /* oidsattr.c */; };
                DC8834961D8A21AB00CE0ACA /* oidsocsp.c in Sources */ = {isa = PBXBuildFile; fileRef = DC88344E1D8A21AA00CE0ACA /* oidsocsp.c */; };
+               DC8EB58D1F70743100080CF2 /* SOSPeerInfoV2.h in Copy SecureObjectSync Headers */ = {isa = PBXBuildFile; fileRef = DCC78D681D8085F200865A7C /* SOSPeerInfoV2.h */; };
                DC9036B31D9DFED600B6C234 /* ss_types.defs in Headers */ = {isa = PBXBuildFile; fileRef = DC6A82771D87733C00418608 /* ss_types.defs */; settings = {ATTRIBUTES = (Public, ); }; };
                DC9082C41EA0277600D0C1C5 /* CKKSZoneChangeFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9082C31EA0276000D0C1C5 /* CKKSZoneChangeFetcher.m */; };
                DC9082C51EA0277700D0C1C5 /* CKKSZoneChangeFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9082C31EA0276000D0C1C5 /* CKKSZoneChangeFetcher.m */; };
                DC9082C61EA027DB00D0C1C5 /* CKKSZoneChangeFetcher.h in Headers */ = {isa = PBXBuildFile; fileRef = DC9082C21EA0276000D0C1C5 /* CKKSZoneChangeFetcher.h */; };
                DC9082C71EA027DC00D0C1C5 /* CKKSZoneChangeFetcher.h in Headers */ = {isa = PBXBuildFile; fileRef = DC9082C21EA0276000D0C1C5 /* CKKSZoneChangeFetcher.h */; };
+               DC926F071F33F7C20012A315 /* SecCodeHost.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD067981D8CDF7E007602F1 /* SecCodeHost.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               DC926F081F33F7D30012A315 /* SecCodeHost.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD067981D8CDF7E007602F1 /* SecCodeHost.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               DC926F091F33FA8D0012A315 /* CKKSControlProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = DCF7A8A21F0450EB00CABE89 /* CKKSControlProtocol.m */; };
+               DC926F0A1F33FA8E0012A315 /* CKKSControlProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = DCF7A8A21F0450EB00CABE89 /* CKKSControlProtocol.m */; };
                DC94BCCA1F10448600E07CEB /* CloudKitCategories.h in Headers */ = {isa = PBXBuildFile; fileRef = DC94BCC81F10448600E07CEB /* CloudKitCategories.h */; };
                DC94BCCB1F10448600E07CEB /* CloudKitCategories.h in Headers */ = {isa = PBXBuildFile; fileRef = DC94BCC81F10448600E07CEB /* CloudKitCategories.h */; };
                DC94BCCC1F10448600E07CEB /* CloudKitCategories.m in Sources */ = {isa = PBXBuildFile; fileRef = DC94BCC91F10448600E07CEB /* CloudKitCategories.m */; };
                DC963E801D95EBD1008A153E /* libsecurity_apple_csp.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCF784F91D88B63800E694BB /* libsecurity_apple_csp.txt */; };
                DC963E821D95EC1C008A153E /* libsecurity_codesigning.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCD068CB1D8CDFFE007602F1 /* libsecurity_codesigning.plist */; };
                DC963E841D95EC31008A153E /* libsecurity_codesigning.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCD068CC1D8CDFFE007602F1 /* libsecurity_codesigning.txt */; };
-               DC963EC51D95F52C008A153E /* oids.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785421D778A7400B50D50 /* oids.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC963EC61D95F646008A153E /* der_plist.h in Headers */ = {isa = PBXBuildFile; fileRef = 524492931AFD6D480043695A /* der_plist.h */; };
                DC9A2C5F1EB3F557008FAC27 /* CKKSTests+Coalesce.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9A2C5E1EB3F556008FAC27 /* CKKSTests+Coalesce.m */; };
                DC9A2C7F1EB40A76008FAC27 /* OCMock.framework in Embed OCMock */ = {isa = PBXBuildFile; fileRef = DC3502E81E02172C00BC0587 /* OCMock.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
                DC9C75161E4BCE1800F1CA0D /* CKKSOperationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9C750F1E4BCC5100F1CA0D /* CKKSOperationTests.m */; };
+               DC9C95971F748D0B000D19E5 /* CKKSServerValidationRecoveryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9C95951F748D0B000D19E5 /* CKKSServerValidationRecoveryTests.m */; };
+               DC9C95B41F79CFD1000D19E5 /* CKKSControl.h in Headers */ = {isa = PBXBuildFile; fileRef = DC9C95B21F79CFD1000D19E5 /* CKKSControl.h */; };
+               DC9C95B51F79CFD1000D19E5 /* CKKSControl.h in Headers */ = {isa = PBXBuildFile; fileRef = DC9C95B21F79CFD1000D19E5 /* CKKSControl.h */; };
+               DC9C95BD1F79DC5A000D19E5 /* CKKSControl.h in Headers */ = {isa = PBXBuildFile; fileRef = DC9C95B21F79CFD1000D19E5 /* CKKSControl.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               DC9C95BE1F79DC5F000D19E5 /* CKKSControl.h in Headers */ = {isa = PBXBuildFile; fileRef = DC9C95B21F79CFD1000D19E5 /* CKKSControl.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               DC9C95BF1F79DC88000D19E5 /* CKKSControl.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9C95B31F79CFD1000D19E5 /* CKKSControl.m */; };
+               DC9C95C01F79DC89000D19E5 /* CKKSControl.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9C95B31F79CFD1000D19E5 /* CKKSControl.m */; };
+               DC9FD3231F8587A500C8AAC8 /* CKKSSerializedKey.proto in Sources */ = {isa = PBXBuildFile; fileRef = DC4D49D81F857728007AF2B8 /* CKKSSerializedKey.proto */; };
+               DC9FD32C1F85990A00C8AAC8 /* CKKSPeer.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9FD3291F8598F300C8AAC8 /* CKKSPeer.m */; };
+               DC9FD32D1F85990B00C8AAC8 /* CKKSPeer.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9FD3291F8598F300C8AAC8 /* CKKSPeer.m */; };
+               DC9FD3361F86A34F00C8AAC8 /* CKKSSerializedKey.proto in Sources */ = {isa = PBXBuildFile; fileRef = DC4D49D81F857728007AF2B8 /* CKKSSerializedKey.proto */; };
                DCA4D1FF1E552DD50056214F /* CKKSCurrentKeyPointer.m in Sources */ = {isa = PBXBuildFile; fileRef = DCA4D1F41E5520550056214F /* CKKSCurrentKeyPointer.m */; };
                DCA4D2001E552DD50056214F /* CKKSCurrentKeyPointer.m in Sources */ = {isa = PBXBuildFile; fileRef = DCA4D1F41E5520550056214F /* CKKSCurrentKeyPointer.m */; };
                DCA4D2151E5684220056214F /* CKKSReencryptOutgoingItemsOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCA4D2131E5684220056214F /* CKKSReencryptOutgoingItemsOperation.h */; };
                DCA85B9A1E8D981100BA7241 /* client_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC844AEC1E81F315007AAB71 /* client_endpoint.m */; };
                DCA85B9B1E8D981200BA7241 /* client_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC844AEC1E81F315007AAB71 /* client_endpoint.m */; };
                DCAB14271E40039600C81511 /* libASN1_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1_not_installed.a */; };
+               DCAD9B441F8D939C00C5E2AE /* CKKSFixups.h in Headers */ = {isa = PBXBuildFile; fileRef = DCAD9B421F8D939C00C5E2AE /* CKKSFixups.h */; };
+               DCAD9B451F8D939C00C5E2AE /* CKKSFixups.h in Headers */ = {isa = PBXBuildFile; fileRef = DCAD9B421F8D939C00C5E2AE /* CKKSFixups.h */; };
+               DCAD9B461F8D939C00C5E2AE /* CKKSFixups.m in Sources */ = {isa = PBXBuildFile; fileRef = DCAD9B431F8D939C00C5E2AE /* CKKSFixups.m */; };
+               DCAD9B471F8D939C00C5E2AE /* CKKSFixups.m in Sources */ = {isa = PBXBuildFile; fileRef = DCAD9B431F8D939C00C5E2AE /* CKKSFixups.m */; };
+               DCAD9B491F8D95F200C5E2AE /* CloudKitKeychainSyncingFixupTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DCAD9B481F8D95F200C5E2AE /* CloudKitKeychainSyncingFixupTests.m */; };
                DCB221501E8B08A5001598BC /* server_xpc.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB2214A1E8B0861001598BC /* server_xpc.m */; };
                DCB221511E8B08A6001598BC /* server_xpc.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB2214A1E8B0861001598BC /* server_xpc.m */; };
                DCB221531E8B08BC001598BC /* server_xpc.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB2214A1E8B0861001598BC /* server_xpc.m */; };
                DCB221581E8B08C9001598BC /* server_xpc.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB2214A1E8B0861001598BC /* server_xpc.m */; };
                DCB221591E8B08CA001598BC /* server_xpc.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB2214A1E8B0861001598BC /* server_xpc.m */; };
                DCB2215A1E8B08CB001598BC /* server_xpc.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB2214A1E8B0861001598BC /* server_xpc.m */; };
+               DCB332381F46804600178C30 /* SOSSysdiagnose.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB332371F46804000178C30 /* SOSSysdiagnose.h */; };
+               DCB3323B1F4681AE00178C30 /* SecOTR.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AF7FFF315AFB73800B9D400 /* SecOTR.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               DCB3323C1F46833E00178C30 /* SecLogging.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78E661D8085FC00865A7C /* SecLogging.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               DCB332451F47856B00178C30 /* libSOSCommands.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EC341D80CFB200B0A59C /* libSOSCommands.a */; };
+               DCB332591F478C3C00178C30 /* SOSUserKeygen.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D2B1D8085F200865A7C /* SOSUserKeygen.m */; };
+               DCB3325A1F478C4100178C30 /* SOSUserKeygen.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D2C1D8085F200865A7C /* SOSUserKeygen.h */; };
                DCB3407D1D8A24F70054D16E /* Authorization.c in Sources */ = {isa = PBXBuildFile; fileRef = DCB3406F1D8A24F70054D16E /* Authorization.c */; };
                DCB340841D8A24F70054D16E /* Authorization.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB340761D8A24F70054D16E /* Authorization.cpp */; };
                DCB340871D8A24F70054D16E /* trampolineClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB340791D8A24F70054D16E /* trampolineClient.cpp */; };
                DCB343851D8A32A20054D16E /* UnlockReferralItem.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB342D21D8A32A20054D16E /* UnlockReferralItem.h */; };
                DCB343861D8A32A20054D16E /* TrustSettingsUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB342D31D8A32A20054D16E /* TrustSettingsUtils.cpp */; };
                DCB343871D8A32A20054D16E /* TrustSettingsUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB342D41D8A32A20054D16E /* TrustSettingsUtils.h */; };
-               DCB343881D8A32A20054D16E /* SecCertificatePrivP.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB342D51D8A32A20054D16E /* SecCertificatePrivP.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               DCB343891D8A32A20054D16E /* SecBase64P.c in Sources */ = {isa = PBXBuildFile; fileRef = DCB342D61D8A32A20054D16E /* SecBase64P.c */; };
-               DCB3438A1D8A32A20054D16E /* SecFrameworkP.c in Sources */ = {isa = PBXBuildFile; fileRef = DCB342D71D8A32A20054D16E /* SecFrameworkP.c */; };
-               DCB3438B1D8A32A20054D16E /* SecCertificateP.c in Sources */ = {isa = PBXBuildFile; fileRef = DCB342D81D8A32A20054D16E /* SecCertificateP.c */; };
-               DCB3438C1D8A32A20054D16E /* SecCertificateP.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB342D91D8A32A20054D16E /* SecCertificateP.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               DCB3438D1D8A32A20054D16E /* SecCertificateInternalP.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB342DA1D8A32A20054D16E /* SecCertificateInternalP.h */; };
                DCB3438E1D8A32A20054D16E /* tsaDERUtilities.c in Sources */ = {isa = PBXBuildFile; fileRef = DCB342DC1D8A32A20054D16E /* tsaDERUtilities.c */; };
                DCB3438F1D8A32A20054D16E /* tsaDERUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB342DD1D8A32A20054D16E /* tsaDERUtilities.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DCB343901D8A32A20054D16E /* TokenLogin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB342DE1D8A32A20054D16E /* TokenLogin.cpp */; };
                DCBDB3BC1E57CA7A00B61300 /* CKKSViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = DCBDB3B91E57CA7A00B61300 /* CKKSViewManager.h */; };
                DCBDB3BD1E57CA7A00B61300 /* CKKSViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = DCBDB3BA1E57CA7A00B61300 /* CKKSViewManager.m */; };
                DCBDB3BE1E57CA7A00B61300 /* CKKSViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = DCBDB3BA1E57CA7A00B61300 /* CKKSViewManager.m */; };
+               DCBF2F7D1F90084D00ED0CA4 /* CKKSTLKSharingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DCBF2F7C1F90084D00ED0CA4 /* CKKSTLKSharingTests.m */; };
+               DCBF2F851F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCBF2F831F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.h */; };
+               DCBF2F861F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCBF2F831F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.h */; };
+               DCBF2F881F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCBF2F841F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.m */; };
                DCC093791D80B02100F984E4 /* SecOnOSX.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78E671D8085FC00865A7C /* SecOnOSX.h */; };
                DCC0937A1D80B07200F984E4 /* SecOTRSessionPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AF7FFFC15AFB73800B9D400 /* SecOTRSessionPriv.h */; };
                DCC0937B1D80B07B00F984E4 /* SecOTRSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AF7FFFB15AFB73800B9D400 /* SecOTRSession.h */; };
                DCC78EDD1D808AEC00865A7C /* SecDigest.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E481D8085FC00865A7C /* SecDigest.c */; };
                DCC78EDE1D808AF100865A7C /* SecDH.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E461D8085FC00865A7C /* SecDH.c */; };
                DCC78EDF1D808AF800865A7C /* SecCertificateRequest.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E3E1D8085FC00865A7C /* SecCertificateRequest.c */; };
-               DCC78EE01D808B0000865A7C /* SecCertificatePath.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E3B1D8085FC00865A7C /* SecCertificatePath.c */; };
                DCC78EE11D808B0900865A7C /* SecCertificate.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E381D8085FC00865A7C /* SecCertificate.c */; };
                DCC78EE21D808B0E00865A7C /* SecCTKKey.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E441D8085FC00865A7C /* SecCTKKey.c */; };
                DCC78EE31D808B1300865A7C /* SecCMS.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E421D8085FC00865A7C /* SecCMS.c */; };
                DCC78EE51D808B2100865A7C /* SecBase64.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E351D8085FC00865A7C /* SecBase64.c */; };
                DCC78EE61D808B2A00865A7C /* SecAccessControl.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E301D8085FC00865A7C /* SecAccessControl.c */; };
                DCC78EE71D808B2F00865A7C /* secViewDisplay.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D9E1D8085F200865A7C /* secViewDisplay.c */; };
-               DCC78EE81D808B3500865A7C /* secToolFileIO.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D931D8085F200865A7C /* secToolFileIO.c */; };
                DCCA5E841E539EE7009EE93D /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCCA5E831E539EE7009EE93D /* AppKit.framework */; };
                DCCBFA1E1DBA95CD001DD54D /* kc-20-item-delete-stress.c in Sources */ = {isa = PBXBuildFile; fileRef = DCCBFA1D1DBA95CD001DD54D /* kc-20-item-delete-stress.c */; };
                DCCBFA391DBAE445001DD54D /* SecInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C6416F00BB357D5001C83FD /* SecInternal.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DCD068641D8CDF7E007602F1 /* detachedrep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067E11D8CDF7E007602F1 /* detachedrep.cpp */; };
                DCD068651D8CDF7E007602F1 /* piddiskrep.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD067E21D8CDF7E007602F1 /* piddiskrep.h */; };
                DCD068661D8CDF7E007602F1 /* piddiskrep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067E31D8CDF7E007602F1 /* piddiskrep.cpp */; };
-               DCD068691D8CDF7E007602F1 /* SecCodeHostLib.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD067E71D8CDF7E007602F1 /* SecCodeHostLib.h */; };
                DCD0686E1D8CDF7E007602F1 /* csdatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD067EE1D8CDF7E007602F1 /* csdatabase.h */; };
                DCD0686F1D8CDF7E007602F1 /* csdatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067EF1D8CDF7E007602F1 /* csdatabase.cpp */; };
                DCD068701D8CDF7E007602F1 /* cserror.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD067F01D8CDF7E007602F1 /* cserror.h */; };
                DCD06A781D8CE309007602F1 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD06A791D8CE30F007602F1 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E43C48C1B00D07000E5ECB2 /* CoreFoundation.framework */; };
                DCD06A7A1D8CE318007602F1 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
-               DCD06B3D1D8E0D7D007602F1 /* debugging.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06AB11D8E0D7D007602F1 /* debugging.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06B3E1D8E0D7D007602F1 /* FileLockTransaction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06AB21D8E0D7D007602F1 /* FileLockTransaction.cpp */; };
                DCD06B3F1D8E0D7D007602F1 /* FileLockTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06AB31D8E0D7D007602F1 /* FileLockTransaction.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06B401D8E0D7D007602F1 /* CSPDLTransaction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06AB41D8E0D7D007602F1 /* CSPDLTransaction.cpp */; };
                DCD66DBA1D82052000DB1393 /* SecPolicyLeafCallbacks.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E7F1D8085FC00865A7C /* SecPolicyLeafCallbacks.c */; };
                DCD66DBB1D82052700DB1393 /* SecPolicy.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E7E1D8085FC00865A7C /* SecPolicy.c */; };
                DCD66DBC1D82052B00DB1393 /* SecKeyAdaptors.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E621D8085FC00865A7C /* SecKeyAdaptors.c */; };
-               DCD66DBD1D82053100DB1393 /* SecCertificatePath.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E3B1D8085FC00865A7C /* SecCertificatePath.c */; };
                DCD66DBE1D82053700DB1393 /* SecBase64.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E351D8085FC00865A7C /* SecBase64.c */; };
                DCD66DBF1D82053E00DB1393 /* SecDigest.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E481D8085FC00865A7C /* SecDigest.c */; };
                DCD66DC01D82054500DB1393 /* SecCertificate.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E381D8085FC00865A7C /* SecCertificate.c */; };
                DCD6C4B41EC5302500414FEE /* CKKSNearFutureScheduler.m in Sources */ = {isa = PBXBuildFile; fileRef = DCD6C4B11EC5302500414FEE /* CKKSNearFutureScheduler.m */; };
                DCD6C4B51EC5302500414FEE /* CKKSNearFutureScheduler.m in Sources */ = {isa = PBXBuildFile; fileRef = DCD6C4B11EC5302500414FEE /* CKKSNearFutureScheduler.m */; };
                DCD6C4B71EC5319600414FEE /* CKKSNearFutureSchedulerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DCD6C4B61EC5319600414FEE /* CKKSNearFutureSchedulerTests.m */; };
+               DCD7EE841F4E46F9007D9804 /* accountCirclesViewsPrint.m in Sources */ = {isa = PBXBuildFile; fileRef = 48C2F9321E4BCFC30093D70C /* accountCirclesViewsPrint.m */; };
+               DCD7EE851F4E47D2007D9804 /* reqparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067C31D8CDF7E007602F1 /* reqparser.cpp */; };
+               DCD7EE981F4F4DE9007D9804 /* SecBase64.h in Headers */ = {isa = PBXBuildFile; fileRef = 18351B8F14CB65870097860E /* SecBase64.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               DCD7EE991F4F4E03007D9804 /* ocspTemplates.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787661D77911D00B50D50 /* ocspTemplates.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               DCD7EE9A1F4F5156007D9804 /* oidsocsp.h in Headers */ = {isa = PBXBuildFile; fileRef = DC88344F1D8A21AA00CE0ACA /* oidsocsp.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               DCD7EEA41F4F58D7007D9804 /* SecLogging.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78E661D8085FC00865A7C /* SecLogging.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DCD8A0CF1E09EA1800E4FA0A /* SecKeybagSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C9E1D8085D800865A7C /* SecKeybagSupport.c */; };
                DCD8A1321E09EE0F00E4FA0A /* SOSPeerInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D631D8085F200865A7C /* SOSPeerInfo.m */; };
                DCD8A1511E09EE0F00E4FA0A /* SOSViews.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D4A1D8085F200865A7C /* SOSViews.m */; };
                DCD8A15A1E09EE0F00E4FA0A /* SOSAccountTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D151D8085F200865A7C /* SOSAccountTransaction.h */; };
                DCD8A15C1E09EE0F00E4FA0A /* SOSBackupSliceKeyBag.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D2A1D8085F200865A7C /* SOSBackupSliceKeyBag.h */; };
                DCD8A15D1E09EE0F00E4FA0A /* SOSCircle.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D321D8085F200865A7C /* SOSCircle.h */; };
-               DCD8A15E1E09EE0F00E4FA0A /* SOSCircleDer.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D341D8085F200865A7C /* SOSCircleDer.h */; };
                DCD8A15F1E09EE0F00E4FA0A /* SOSCirclePriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D311D8085F200865A7C /* SOSCirclePriv.h */; };
                DCD8A1601E09EE0F00E4FA0A /* SOSCircleRings.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D331D8085F200865A7C /* SOSCircleRings.h */; };
                DCD8A1611E09EE0F00E4FA0A /* SOSCircleV2.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D301D8085F200865A7C /* SOSCircleV2.h */; };
                DCD8A1851E09EE0F00E4FA0A /* SOSRingDER.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D411D8085F200865A7C /* SOSRingDER.h */; };
                DCD8A1861E09EE0F00E4FA0A /* SOSRingPeerInfoUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D431D8085F200865A7C /* SOSRingPeerInfoUtils.h */; };
                DCD8A1871E09EE0F00E4FA0A /* SOSRingTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D451D8085F200865A7C /* SOSRingTypes.h */; };
-               DCD8A1881E09EE0F00E4FA0A /* SOSAccountPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = CD9021471DE27A9E00F81DC4 /* SOSAccountPriv.h */; };
                DCD8A1891E09EE0F00E4FA0A /* SOSRingUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D471D8085F200865A7C /* SOSRingUtils.h */; };
                DCD8A18A1E09EE0F00E4FA0A /* SOSRingV0.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D491D8085F200865A7C /* SOSRingV0.h */; };
                DCD8A18B1E09EE0F00E4FA0A /* SOSTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D751D8085F200865A7C /* SOSTransport.h */; };
                DCD8A1901E09EE0F00E4FA0A /* SOSAccountTrust.h in Headers */ = {isa = PBXBuildFile; fileRef = CD31F8611DCD4C1400414B46 /* SOSAccountTrust.h */; };
                DCD8A1931E09EE0F00E4FA0A /* SOSTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D8F1D8085F200865A7C /* SOSTypes.h */; };
-               DCD8A1941E09EE0F00E4FA0A /* SOSUserKeygen.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D2C1D8085F200865A7C /* SOSUserKeygen.h */; };
                DCD8A1951E09EE0F00E4FA0A /* SOSViews.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D4B1D8085F200865A7C /* SOSViews.h */; };
                DCD8A19A1E09EE9800E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
                DCD8A19D1E09EEC800E4FA0A /* SOSBackupSliceKeyBag.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D291D8085F200865A7C /* SOSBackupSliceKeyBag.m */; };
                DCD8A19F1E09EF0F00E4FA0A /* SOSInternal.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D8D1D8085F200865A7C /* SOSInternal.m */; };
                DCD8A1A01E09EF3500E4FA0A /* SOSCloudKeychainClient.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CF61D8085F200865A7C /* SOSCloudKeychainClient.c */; };
                DCD8A1A11E09EF5C00E4FA0A /* SOSCloudKeychainConstants.c in Sources */ = {isa = PBXBuildFile; fileRef = E7A5F4D71C0D01B000F3BEBB /* SOSCloudKeychainConstants.c */; };
-               DCD8A1A31E09EF7800E4FA0A /* SOSSysdiagnose.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D8C1D8085F200865A7C /* SOSSysdiagnose.m */; };
                DCD8A1A41E09EF9000E4FA0A /* SOSPeerInfoCollections.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D6A1D8085F200865A7C /* SOSPeerInfoCollections.c */; };
                DCD8A1A51E09EFAE00E4FA0A /* SOSPeerInfoV2.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D671D8085F200865A7C /* SOSPeerInfoV2.m */; };
                DCD8A1A61E09EFD700E4FA0A /* SOSKVSKeys.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D721D8085F200865A7C /* SOSKVSKeys.m */; };
                DCD8A1A71E09F01300E4FA0A /* SOSPeerInfoSecurityProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D6F1D8085F200865A7C /* SOSPeerInfoSecurityProperties.m */; };
-               DCD8A1A81E09F03100E4FA0A /* SOSUserKeygen.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D2B1D8085F200865A7C /* SOSUserKeygen.m */; };
                DCD8A1A91E09F04700E4FA0A /* SOSECWrapUnwrap.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D881D8085F200865A7C /* SOSECWrapUnwrap.c */; };
-               DCD8A1AC1E09F09200E4FA0A /* SOSCircleDer.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D351D8085F200865A7C /* SOSCircleDer.c */; };
                DCD8A1AE1E09F0C500E4FA0A /* SOSRingDER.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D401D8085F200865A7C /* SOSRingDER.c */; };
                DCD8A1AF1E09F0DC00E4FA0A /* SOSRingUtils.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D461D8085F200865A7C /* SOSRingUtils.c */; };
                DCD8A1B01E09F0F400E4FA0A /* SOSRingTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D441D8085F200865A7C /* SOSRingTypes.m */; };
                DCD8A1BD1E09F1D600E4FA0A /* SOSFullPeerInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D611D8085F200865A7C /* SOSFullPeerInfo.m */; };
                DCD8A1C21E09F23B00E4FA0A /* SOSRecoveryKeyBag.m in Sources */ = {isa = PBXBuildFile; fileRef = 48776C731DA5BB4200CC09B9 /* SOSRecoveryKeyBag.m */; };
                DCD8A1C71E09F2B400E4FA0A /* SOSTransport.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D741D8085F200865A7C /* SOSTransport.m */; };
-               DCD8A1DA1E09F54700E4FA0A /* SOSAccountDer.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D1C1D8085F200865A7C /* SOSAccountDer.m */; };
                DCD8A1DB1E09F5D100E4FA0A /* SOSAccountTrust.m in Sources */ = {isa = PBXBuildFile; fileRef = CD31F8601DCD4C1400414B46 /* SOSAccountTrust.m */; };
                DCD8A1DC1E09F5E500E4FA0A /* SOSAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D131D8085F200865A7C /* SOSAccount.h */; };
                DCD8A1DD1E09F73F00E4FA0A /* SOSPeerInfoDER.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D661D8085F200865A7C /* SOSPeerInfoDER.h */; };
                DCD8A1E01E09F76800E4FA0A /* SOSPeerInfoRingState.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D6E1D8085F200865A7C /* SOSPeerInfoRingState.h */; };
                DCD8A1E11E09F76D00E4FA0A /* SOSPeerInfoSecurityProperties.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D701D8085F200865A7C /* SOSPeerInfoSecurityProperties.h */; };
                DCD8A1E21E09F78A00E4FA0A /* SOSTransportCircle.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D791D8085F200865A7C /* SOSTransportCircle.h */; };
-               DCD8A1E31E09F7E700E4FA0A /* SOSAccountCloudParameters.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D1A1D8085F200865A7C /* SOSAccountCloudParameters.m */; };
                DCD8A1E41E09F80B00E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
                DCD8A1E71E09F85400E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
                DCD8A1EA1E09F87B00E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
                DCD8A1F91E09F98E00E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
                DCD8A1FC1E09FA0B00E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
                DCD8A1FF1E09FA6100E4FA0A /* secViewDisplay.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D9E1D8085F200865A7C /* secViewDisplay.c */; };
-               DCD8A2001E09FA7900E4FA0A /* secToolFileIO.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D931D8085F200865A7C /* secToolFileIO.c */; };
                DCD8A2011E09FAD900E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
                DCD8A2041E09FB0D00E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
                DCD8A20A1E09FB5900E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; settings = {ATTRIBUTES = (Weak, ); }; };
                DCD8A20B1E09FB5A00E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
                DCD8A20C1E09FB6600E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
+               DCDB296C1FD8820400B5D242 /* SFAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9DB1F1540CE0082882F /* SFAnalytics.m */; };
+               DCDB296E1FD8821400B5D242 /* SFAnalyticsActivityTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CBF65381FA147E500A68667 /* SFAnalyticsActivityTracker.m */; };
+               DCDB29701FD8821800B5D242 /* SFAnalyticsMultiSampler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CDB5FED1FA78CB400410924 /* SFAnalyticsMultiSampler.m */; };
+               DCDB29721FD8821D00B5D242 /* SFAnalyticsSampler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CDF8DE61F95562B00140B54 /* SFAnalyticsSampler.m */; };
+               DCDB29741FD8822200B5D242 /* SFAnalyticsSQLiteStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C69518D1F75A7DB00F68F91 /* SFAnalyticsSQLiteStore.m */; };
+               DCDB29791FD8844C00B5D242 /* client.c in Sources */ = {isa = PBXBuildFile; fileRef = 7908507F0CA87CF00083CC4D /* client.c */; };
+               DCDB297A1FD8845600B5D242 /* client_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC844AEC1E81F315007AAB71 /* client_endpoint.m */; };
+               DCDB297B1FD8847100B5D242 /* SecTask.c in Sources */ = {isa = PBXBuildFile; fileRef = 107226D00D91DB32003CF14F /* SecTask.c */; };
+               DCDB297C1FD8848A00B5D242 /* SFSQLite.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BC1F152EB10082882F /* SFSQLite.m */; };
+               DCDB297D1FD8849A00B5D242 /* SFSQLiteStatement.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BF1F152EB10082882F /* SFSQLiteStatement.m */; };
+               DCDB297E1FD8849D00B5D242 /* SFObjCType.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BE1F152EB10082882F /* SFObjCType.m */; };
                DCDCC7E31D9B54EE006487E8 /* secd-202-recoverykey.m in Sources */ = {isa = PBXBuildFile; fileRef = DCDCC7DD1D9B54DF006487E8 /* secd-202-recoverykey.m */; };
                DCDCC7E51D9B5526006487E8 /* SOSAccountSync.m in Sources */ = {isa = PBXBuildFile; fileRef = DCDCC7E41D9B551C006487E8 /* SOSAccountSync.m */; };
                DCDCC8331D9B6A00006487E8 /* libcoretls.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CFC029B1D41650700E6283B /* libcoretls.dylib */; };
                DCDCCB3E1DF25DA0006E840E /* ApplePushService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC9EBA231DEE36FE00D0F733 /* ApplePushService.framework */; };
                DCDCCB8F1DF7B8D4006E840E /* CKKSItem.h in Headers */ = {isa = PBXBuildFile; fileRef = DCDCCB8D1DF7B8D4006E840E /* CKKSItem.h */; };
                DCDCCB901DF7B8D4006E840E /* CKKSItem.m in Sources */ = {isa = PBXBuildFile; fileRef = DCDCCB8E1DF7B8D4006E840E /* CKKSItem.m */; };
+               DCDD59CC1F69ACF70060641E /* SOSCloudCircleInternal.h in Copy SecureObjectSync Headers */ = {isa = PBXBuildFile; fileRef = DCC78D8B1D8085F200865A7C /* SOSCloudCircleInternal.h */; };
+               DCDD59CD1F69ACF70060641E /* SOSTypes.h in Copy SecureObjectSync Headers */ = {isa = PBXBuildFile; fileRef = DCC78D8F1D8085F200865A7C /* SOSTypes.h */; };
+               DCDD59CE1F69ACF70060641E /* SOSViews.h in Copy SecureObjectSync Headers */ = {isa = PBXBuildFile; fileRef = DCC78D4B1D8085F200865A7C /* SOSViews.h */; };
+               DCDD59CF1F69ACF70060641E /* SOSPeerInfo.h in Copy SecureObjectSync Headers */ = {isa = PBXBuildFile; fileRef = DCC78D641D8085F200865A7C /* SOSPeerInfo.h */; };
+               DCDD59D01F69ACF70060641E /* SOSCloudCircle.h in Copy SecureObjectSync Headers */ = {isa = PBXBuildFile; fileRef = DCC78D8A1D8085F200865A7C /* SOSCloudCircle.h */; };
+               DCDD59D21F69ACF70060641E /* SOSBackupSliceKeyBag.h in Copy SecureObjectSync Headers */ = {isa = PBXBuildFile; fileRef = DCC78D2A1D8085F200865A7C /* SOSBackupSliceKeyBag.h */; };
                DCDF0A4F1D81D76F007AF174 /* Security.exp-in in Sources */ = {isa = PBXBuildFile; fileRef = 4CB7405F0A47498100D641BB /* Security.exp-in */; };
                DCE278DD1ED789EF0083B485 /* CKKSCurrentItemPointer.h in Headers */ = {isa = PBXBuildFile; fileRef = DCE278DB1ED789EF0083B485 /* CKKSCurrentItemPointer.h */; };
                DCE278DE1ED789EF0083B485 /* CKKSCurrentItemPointer.h in Headers */ = {isa = PBXBuildFile; fileRef = DCE278DB1ED789EF0083B485 /* CKKSCurrentItemPointer.h */; };
                DCE4E94A1D7F3E8E00AFB96E /* com.apple.security.keychain-circle-notification.plist in Resources */ = {isa = PBXBuildFile; fileRef = DCE4E9461D7F3E8700AFB96E /* com.apple.security.keychain-circle-notification.plist */; };
                DCE4E94B1D7F3E8E00AFB96E /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = DCE4E9471D7F3E8700AFB96E /* InfoPlist.strings */; };
                DCE4E9711D7F3EBB00AFB96E /* com.apple.security.keychain-circle-notification.plist in Install launchd plist */ = {isa = PBXBuildFile; fileRef = DCE4E9461D7F3E8700AFB96E /* com.apple.security.keychain-circle-notification.plist */; };
+               DCE5DC0F1EA80256006308A6 /* SOSSysdiagnose.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D8C1D8085F200865A7C /* SOSSysdiagnose.m */; };
+               DCE5DC101EA802DA006308A6 /* secToolFileIO.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D921D8085F200865A7C /* secToolFileIO.h */; };
+               DCE5DC111EA80348006308A6 /* accountCirclesViewsPrint.h in Headers */ = {isa = PBXBuildFile; fileRef = 48C2F9331E4BCFC30093D70C /* accountCirclesViewsPrint.h */; };
+               DCE5DC121EA80369006308A6 /* libSOSCommands.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EC341D80CFB200B0A59C /* libSOSCommands.a */; };
                DCE7F2091F21726500DDB0F7 /* CKKSAPSReceiverTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE7F2081F21726500DDB0F7 /* CKKSAPSReceiverTests.m */; };
                DCE809F31D9342BE00F91177 /* com.apple.securityd.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCEE1E851D93424D00DC0EB7 /* com.apple.securityd.plist */; };
                DCEA5D551E2826DB0089CF55 /* CKKSSIV.h in Headers */ = {isa = PBXBuildFile; fileRef = DCEA5D531E2826DB0089CF55 /* CKKSSIV.h */; };
                DCEDE3921D80B10E00C3826E /* SecOTRDHKey.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AF7FFF415AFB73800B9D400 /* SecOTRDHKey.h */; };
                DCEDE3931D80B11200C3826E /* SecOTR.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AF7FFF315AFB73800B9D400 /* SecOTR.h */; };
                DCEDE3941D80B11800C3826E /* SecPasswordGenerate.h in Headers */ = {isa = PBXBuildFile; fileRef = CDDE9BC31729AB910013B0E8 /* SecPasswordGenerate.h */; };
-               DCEDE3951D80B12000C3826E /* secToolFileIO.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D921D8085F200865A7C /* secToolFileIO.h */; };
                DCEDE3961D80B12600C3826E /* SecTrustInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78E921D8085FC00865A7C /* SecTrustInternal.h */; };
                DCEE1E861D93427400DC0EB7 /* com.apple.securityd.plist in Resources */ = {isa = PBXBuildFile; fileRef = DCE4E80D1D7A4E3A00AFB96E /* com.apple.securityd.plist */; };
                DCF7839D1D88B60D00E694BB /* aesCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF783151D88B60D00E694BB /* aesCommon.h */; };
                DCF789481D88D17C00E694BB /* AppleX509TPBuiltin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCF789471D88D17C00E694BB /* AppleX509TPBuiltin.cpp */; };
                DCF7A8A01F04502400CABE89 /* CKKSControlProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF7A89F1F04502300CABE89 /* CKKSControlProtocol.h */; };
                DCF7A8A11F04502400CABE89 /* CKKSControlProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF7A89F1F04502300CABE89 /* CKKSControlProtocol.h */; };
-               DCF7A8A31F0450EB00CABE89 /* CKKSControlProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = DCF7A8A21F0450EB00CABE89 /* CKKSControlProtocol.m */; };
-               DCF7A8A41F0450EB00CABE89 /* CKKSControlProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = DCF7A8A21F0450EB00CABE89 /* CKKSControlProtocol.m */; };
-               DCF7A8A51F0451AC00CABE89 /* CKKSControlProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = DCF7A8A21F0450EB00CABE89 /* CKKSControlProtocol.m */; };
+               DCFABF8E20081E2F001128B5 /* CKKSDeviceStateUploadTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFABF8D20081E2F001128B5 /* CKKSDeviceStateUploadTests.m */; };
                DCFAEDCF1D999859005187E4 /* SOSAccountGhost.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFAEDC81D999851005187E4 /* SOSAccountGhost.m */; };
                DCFAEDD21D99991F005187E4 /* secd-668-ghosts.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFAEDD11D9998DD005187E4 /* secd-668-ghosts.m */; };
                DCFAEDD61D99A47A005187E4 /* secd-36-ks-encrypt.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFAEDD51D99A464005187E4 /* secd-36-ks-encrypt.m */; };
                EB10559E1E14E39D0003C309 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E43C48C1B00D07000E5ECB2 /* CoreFoundation.framework */; };
                EB10559F1E14E3A80003C309 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };
                EB108F261E6CE4D2003B0456 /* KCPairingTest.m in Sources */ = {isa = PBXBuildFile; fileRef = EB413B7E1E663A8300592085 /* KCPairingTest.m */; };
+               EB10A3E520356E2000E84270 /* OTConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = EB10A3E320356E2000E84270 /* OTConstants.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               EB10A3E620356E2000E84270 /* OTConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = EB10A3E420356E2000E84270 /* OTConstants.m */; };
+               EB10A3E720356E6500E84270 /* OTConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = EB10A3E420356E2000E84270 /* OTConstants.m */; };
+               EB10A3E820356E6500E84270 /* OTConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = EB10A3E420356E2000E84270 /* OTConstants.m */; };
+               EB10A3E920356E7A00E84270 /* OTConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = EB10A3E420356E2000E84270 /* OTConstants.m */; };
+               EB10A3FC2035789B00E84270 /* OTConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = EB10A3E320356E2000E84270 /* OTConstants.h */; settings = {ATTRIBUTES = (Private, ); }; };
                EB27FF2D1E407FF600EC9E3A /* ckksctl.m in Sources */ = {isa = PBXBuildFile; fileRef = EB27FF0C1E402C8000EC9E3A /* ckksctl.m */; };
                EB27FF311E408DC700EC9E3A /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };
                EB2CA4DA1D2C28F100AB770F /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };
                EB433A2E1CC325E900A7EACE /* secitemstresstest.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = EB433A2D1CC325E900A7EACE /* secitemstresstest.entitlements */; };
                EB48C1A51E573EE400EC5E57 /* whoami.m in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA911D80CC2A00B0A59C /* whoami.m */; };
                EB48C1A61E573EEC00EC5E57 /* sos.m in Sources */ = {isa = PBXBuildFile; fileRef = EB48C19E1E573EDC00EC5E57 /* sos.m */; };
+               EB49B2B1202D8780003F34A0 /* secdmockaks.m in Sources */ = {isa = PBXBuildFile; fileRef = EB49B2B0202D8780003F34A0 /* secdmockaks.m */; };
+               EB49B2BB202D8894003F34A0 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
+               EB49B2BC202DEF14003F34A0 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CB96BB41F966E0C00E11457 /* libsqlite3.tbd */; };
+               EB49B2BD202DEF29003F34A0 /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
+               EB49B2BE202DEF29003F34A0 /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };
+               EB49B2BF202DEF67003F34A0 /* libsecurity.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCC78EA91D8088E200865A7C /* libsecurity.a */; };
+               EB49B2C0202DEF7D003F34A0 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
+               EB49B2C1202DEF8D003F34A0 /* libASN1_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1_not_installed.a */; };
+               EB49B2C2202DF002003F34A0 /* libDER.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D46246911F9AE2E400D63882 /* libDER.a */; };
+               EB49B2C7202DF0E9003F34A0 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
+               EB49B2CD202DF0F9003F34A0 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };
+               EB49B2D0202DF14D003F34A0 /* SFAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9DB1F1540CE0082882F /* SFAnalytics.m */; };
+               EB49B2D1202DF15F003F34A0 /* SFAnalyticsActivityTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CBF65381FA147E500A68667 /* SFAnalyticsActivityTracker.m */; };
+               EB49B2D2202DF17D003F34A0 /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E7C01D7A463E00AFB96E /* SecurityFoundation.framework */; };
+               EB49B2D3202DF1AC003F34A0 /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
+               EB49B2D4202DF1C1003F34A0 /* client.c in Sources */ = {isa = PBXBuildFile; fileRef = 7908507F0CA87CF00083CC4D /* client.c */; };
+               EB49B2D5202DF1D8003F34A0 /* SecTask.c in Sources */ = {isa = PBXBuildFile; fileRef = 107226D00D91DB32003CF14F /* SecTask.c */; };
+               EB49B2D7202DF1F7003F34A0 /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
+               EB49B2D8202DF1F7003F34A0 /* server_xpc.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB2214A1E8B0861001598BC /* server_xpc.m */; };
+               EB49B2D9202DF1F7003F34A0 /* server_security_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.c */; };
+               EB49B2DB202DF20F003F34A0 /* spi.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB01D8085D800865A7C /* spi.c */; };
+               EB49B2DD202DF259003F34A0 /* libbsm.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = EB49B2DC202DF251003F34A0 /* libbsm.tbd */; };
+               EB49B2E0202DF5D7003F34A0 /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
+               EB49B2E2202DFDA3003F34A0 /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E9411D7F3E6E00AFB96E /* CoreCDP.framework */; };
+               EB49B2E5202DFEB3003F34A0 /* mockaks.m in Sources */ = {isa = PBXBuildFile; fileRef = EB49B2E4202DFE7F003F34A0 /* mockaks.m */; };
+               EB49B308202FF421003F34A0 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47D1838B1FB3827700CFCD89 /* OCMock.framework */; };
+               EB49B310202FF4AC003F34A0 /* OCMock.framework in Embedded OCMock */ = {isa = PBXBuildFile; fileRef = DC3502E81E02172C00BC0587 /* OCMock.framework */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
                EB4B6E201DC0682A00AFC494 /* SecADWrapper.c in Sources */ = {isa = PBXBuildFile; fileRef = EBF3749A1DC064200065D840 /* SecADWrapper.c */; };
                EB4B6E261DC0683600AFC494 /* SecADWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = EBF3749B1DC064200065D840 /* SecADWrapper.h */; };
+               EB4E0CDB1FF36A9700CDCACC /* CKKSReachabilityTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = EB4E0CD51FF36A1900CDCACC /* CKKSReachabilityTracker.m */; };
+               EB4E0CDC1FF36A9700CDCACC /* CKKSReachabilityTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = EB4E0CD51FF36A1900CDCACC /* CKKSReachabilityTracker.m */; };
                EB58A0511E74BF07009C10D7 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };
                EB59D6731E95F01600997EAC /* libcompression.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = EB59D66B1E95EF2900997EAC /* libcompression.dylib */; };
+               EB5E3BCC2003C67A00F1631B /* SecSignpost.h in Headers */ = {isa = PBXBuildFile; fileRef = EB5E3BC62003C66300F1631B /* SecSignpost.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               EB5E3BCD2003C67B00F1631B /* SecSignpost.h in Headers */ = {isa = PBXBuildFile; fileRef = EB5E3BC62003C66300F1631B /* SecSignpost.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               EB6667C7204CD69F000B404F /* testPlistDER.m in Sources */ = {isa = PBXBuildFile; fileRef = EB6667BE204CD65E000B404F /* testPlistDER.m */; };
                EB6928C51D9C9C6E00062A18 /* SecRecoveryKey.h in Headers */ = {isa = PBXBuildFile; fileRef = EB6928BE1D9C9C5900062A18 /* SecRecoveryKey.h */; settings = {ATTRIBUTES = (Private, ); }; };
                EB6928C61D9C9C6F00062A18 /* SecRecoveryKey.h in Headers */ = {isa = PBXBuildFile; fileRef = EB6928BE1D9C9C5900062A18 /* SecRecoveryKey.h */; settings = {ATTRIBUTES = (Private, ); }; };
                EB6928CA1D9C9E1800062A18 /* rk_01_recoverykey.m in Sources */ = {isa = PBXBuildFile; fileRef = EB6928C91D9C9D9D00062A18 /* rk_01_recoverykey.m */; };
                EB75B48A1E75405100E469CC /* libsecurity.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCC78EA91D8088E200865A7C /* libsecurity.a */; };
                EB75B48C1E75407C00E469CC /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                EB75B48D1E75408900E469CC /* libASN1_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1_not_installed.a */; };
-               EB75B48E1E75408C00E469CC /* libDER_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC59E9EC1D91C9DC001BDDF5 /* libDER_not_installed.a */; };
                EB75B48F1E75409A00E469CC /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CB740680A4749C800D641BB /* libsqlite3.dylib */; };
                EB75B4901E7540AA00E469CC /* libctkclient_test.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4469FBDC1AA0A45C0021AA26 /* libctkclient_test.a */; };
                EB75B4911E7540BF00E469CC /* libcoreauthd_test_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E8B53A41AA0B8A600345E7B /* libcoreauthd_test_client.a */; };
                EB78D3F91E600E93009AFE05 /* SOSCloudCircle.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D891D8085F200865A7C /* SOSCloudCircle.m */; };
                EB7AE6F81E86DACC00B80B15 /* SecPLWrappers.m in Sources */ = {isa = PBXBuildFile; fileRef = EB7AE6F61E86D55400B80B15 /* SecPLWrappers.m */; };
                EB7AE6F91E86DAD200B80B15 /* SecPLWrappers.h in Headers */ = {isa = PBXBuildFile; fileRef = EB7AE6F71E86D55400B80B15 /* SecPLWrappers.h */; };
-               EB7F50C51DB8800A003D787D /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E9411D7F3E6E00AFB96E /* CoreCDP.framework */; };
-               EB7F50CC1DB88A03003D787D /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E9411D7F3E6E00AFB96E /* CoreCDP.framework */; };
                EB9C02481E8A15B40040D3C6 /* secd-37-pairing-initial-sync.m in Sources */ = {isa = PBXBuildFile; fileRef = EB9C02421E8A112A0040D3C6 /* secd-37-pairing-initial-sync.m */; };
                EB9C1D7B1BDFD0E000F89272 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                EB9C1D7E1BDFD0E100F89272 /* secbackupntest.m in Sources */ = {isa = PBXBuildFile; fileRef = EB9C1D7D1BDFD0E100F89272 /* secbackupntest.m */; };
                F667EC611E96E9E700203D5C /* authdtests.m in Sources */ = {isa = PBXBuildFile; fileRef = F6A0971F1E953ABD00B1E7D6 /* authdtests.m */; };
                F667EC621E96EAD200203D5C /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F667EC551E96E94800203D5C /* main.m */; };
                F667EC631E96EDC500203D5C /* libregressionBase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCBFD1D8C648C00070CB0 /* libregressionBase.a */; };
+               F682C1D41F4486F700F1B029 /* libctkloginhelper.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F682C1CE1F4486F600F1B029 /* libctkloginhelper.a */; };
                F6AF96681E646CAF00917214 /* libcoreauthd_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF6A1A01458F000958DC /* libcoreauthd_client.a */; };
                F93C493B1AB8FF530047E01A /* ckcdiagnose.sh in CopyFiles */ = {isa = PBXBuildFile; fileRef = F93C493A1AB8FF530047E01A /* ckcdiagnose.sh */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
                F964772C1E5832540019E4EB /* SecCodePriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD0678E1D8CDF7E007602F1 /* SecCodePriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                        outputFiles = (
                                "$(BUILT_PRODUCTS_DIR)/$(PRODUCT_NAME).$(CURRENT_ARCH).exp",
                        );
-                       script = "#!/bin/sh\n\nfor file in ${HEADER_SEARCH_PATHS[@]} ; do\nHEADER_SEARCH_OPTIONS=\"${HEADER_SEARCH_OPTIONS} -I${file}\"\ndone\n\nxcrun clang -E -Xpreprocessor -P -x c -arch ${CURRENT_ARCH} ${HEADER_SEARCH_OPTIONS} ${OTHER_INPUT_FILE_FLAGS} ${INPUT_FILE_PATH} -o ${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.${CURRENT_ARCH}.exp\n";
+                       script = "#!/bin/sh\n\nfor file in ${HEADER_SEARCH_PATHS[@]} ; do\nHEADER_SEARCH_OPTIONS=\"${HEADER_SEARCH_OPTIONS} -I${file}\"\ndone\n\nfor prep in ${GCC_PREPROCESSOR_DEFINITIONS[@]} ; do\nPREPROCESSOR=\"${PREPROCESSOR} -D${prep}\"\ndone\n\nxcrun clang -E -Xpreprocessor -P -x objective-c -arch ${CURRENT_ARCH} ${HEADER_SEARCH_OPTIONS} ${OTHER_INPUT_FILE_FLAGS} ${PREPROCESSOR} ${INPUT_FILE_PATH} -o ${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.${CURRENT_ARCH}.exp\n";
+               };
+               DC9FD3201F85818000C8AAC8 /* PBXBuildRule */ = {
+                       isa = PBXBuildRule;
+                       compilerSpec = com.apple.compilers.proxy.script;
+                       filePatterns = "*.proto";
+                       fileType = pattern.proxy;
+                       isEditable = 1;
+                       outputFiles = (
+                               "$(INPUT_FILE_DIR)/source/${INPUT_FILE_BASE}.h",
+                               "$(INPUT_FILE_DIR)/source/${INPUT_FILE_BASE}.m",
+                       );
+                       script = "set -x\n\nmkdir -p ${INPUT_FILE_DIR}/source\nprotocompiler --arc --strict --emitDeprecated=NO --generics=YES --outputDir ${INPUT_FILE_DIR}/source --proto ${INPUT_FILE_DIR}/${INPUT_FILE_NAME}\n";
+               };
+               DC9FD3221F85877000C8AAC8 /* PBXBuildRule */ = {
+                       isa = PBXBuildRule;
+                       compilerSpec = com.apple.compilers.proxy.script;
+                       filePatterns = "*.proto";
+                       fileType = pattern.proxy;
+                       isEditable = 1;
+                       outputFiles = (
+                               "$(INPUT_FILE_DIR)/source/${INPUT_FILE_BASE}.h",
+                               "$(INPUT_FILE_DIR)/source/${INPUT_FILE_BASE}.m",
+                       );
+                       script = "set -x\n\nmkdir -p ${INPUT_FILE_DIR}/source\nprotocompiler --arc --strict --emitDeprecated=NO --generics=YES --outputDir ${INPUT_FILE_DIR}/source --proto ${INPUT_FILE_DIR}/${INPUT_FILE_NAME}\n";
                };
                E7B006FF170B56E700B27966 /* PBXBuildRule */ = {
                        isa = PBXBuildRule;
                        outputFiles = (
                                "$(BUILT_PRODUCTS_DIR)/$(PRODUCT_NAME).$(CURRENT_ARCH).exp",
                        );
-                       script = "#!/bin/sh\n\nfor file in ${HEADER_SEARCH_PATHS[@]} ; do\nHEADER_SEARCH_OPTIONS=\"${HEADER_SEARCH_OPTIONS} -I${file}\"\ndone\n\nxcrun clang -E -Xpreprocessor -P -x c -arch ${CURRENT_ARCH} ${HEADER_SEARCH_OPTIONS} ${OTHER_INPUT_FILE_FLAGS} ${INPUT_FILE_PATH} -o ${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.${CURRENT_ARCH}.exp\n";
+                       script = "#!/bin/sh\n\nfor file in ${HEADER_SEARCH_PATHS[@]} ; do\nHEADER_SEARCH_OPTIONS=\"${HEADER_SEARCH_OPTIONS} -I${file}\"\ndone\n\nfor prep in ${GCC_PREPROCESSOR_DEFINITIONS[@]} ; do\nPREPROCESSOR=\"${PREPROCESSOR} -D${prep}\"\ndone\n\nxcrun clang -E -Xpreprocessor -P -x objective-c -arch ${CURRENT_ARCH} ${HEADER_SEARCH_OPTIONS} ${OTHER_INPUT_FILE_FLAGS} ${PREPROCESSOR} ${INPUT_FILE_PATH} -o ${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.${CURRENT_ARCH}.exp\n";
                };
 /* End PBXBuildRule section */
 
                        remoteGlobalIDString = 0C0BDB2E175685B000BC1A7E;
                        remoteInfo = secdtests;
                };
+               0C78CCE41FCC97E7008B4B24 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 0C8BBEFD1FCB446400580909;
+                       remoteInfo = otctl;
+               };
+               0C78CCE61FCC97F1008B4B24 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 0C8BBEFD1FCB446400580909;
+                       remoteInfo = otctl;
+               };
+               0C85DFD51FB38BB6000343A7 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC222C371E034D1F00B09171;
+                       remoteInfo = libsecurityd_ios_NO_AKS;
+               };
+               0C85DFD91FB38BB6000343A7 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
+                       remoteInfo = ASN1_not_installed;
+               };
+               0C85DFDB1FB38BB6000343A7 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;
+               };
+               0C85DFDD1FB38BB6000343A7 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
+                       remoteInfo = SecureObjectSyncFramework;
+               };
+               0C85DFDF1FB38BB6000343A7 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
+                       remoteInfo = SecureObjectSyncServer;
+               };
+               0C85DFE11FB38BB6000343A7 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCC78EA81D8088E200865A7C;
+                       remoteInfo = security;
+               };
                0C99B73F131C984900584CF4 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        remoteGlobalIDString = 4381690B1B4EDCBD00C54D58;
                        remoteInfo = SOSCCAuthPlugin;
                };
+               478D426E1FD72A8100CAB645 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52EDA61D80D58400B0A59C;
+                       remoteInfo = secdRegressions;
+               };
+               478D42701FD72A8100CAB645 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC0BCBD91D8C648C00070CB0;
+                       remoteInfo = regressionBase;
+               };
+               478D42721FD72A8100CAB645 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
+                       remoteInfo = libsecurityd_ios;
+               };
+               478D42741FD72A8100CAB645 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCC78EA81D8088E200865A7C;
+                       remoteInfo = security;
+               };
                47C51B8A1EEA657D0032D9E5 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        remoteGlobalIDString = DC1789031D77980500B50D50;
                        remoteInfo = Security_osx;
                };
+               47DE88CD1FA7AD6200DD3254 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCC78EA81D8088E200865A7C;
+                       remoteInfo = security;
+               };
+               47DE88D41FA7AD7000DD3254 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
+                       remoteInfo = libsecurityd_ios;
+               };
+               47DE88D61FA7ADAC00DD3254 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC0BCBD91D8C648C00070CB0;
+                       remoteInfo = regressionBase;
+               };
+               47DE88D81FA7ADBB00DD3254 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52EDA61D80D58400B0A59C;
+                       remoteInfo = secdRegressions;
+               };
                4C52D0ED16EFCD720079966E /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        remoteGlobalIDString = 5346480017331E1100FE9172;
                        remoteInfo = KeychainSyncAccountNotification;
                };
-               5DDD0BED16D6748900D6C0D6 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 728B56A016D59979008FA3AB;
-                       remoteInfo = OTAPKIAssetTool;
-               };
                5E10995319A5E80B00A60E2B /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        remoteGlobalIDString = 6CCDF7831E3C25FA003F2555;
                        remoteInfo = KeychainEntitledTestRunner;
                };
-               6C98082E1E788AEB00E70590 /* PBXContainerItemProxy */ = {
+               6C7C38801FD88C4700DFFE68 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 6C46056B1F882B9B001421B6;
+                       remoteInfo = KeychainAnalyticsTests;
+               };
+               6C7C38871FD88C5A00DFFE68 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = DC59E9AC1D91C9DC001BDDF5;
-                       remoteInfo = DER_not_installed;
+                       remoteGlobalIDString = 6C46056B1F882B9B001421B6;
+                       remoteInfo = KeychainAnalyticsTests;
                };
                6C9808301E788AEB00E70590 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        remoteGlobalIDString = DC222C371E034D1F00B09171;
                        remoteInfo = libsecurityd_ios_NO_AKS;
                };
-               6C98086A1E788AFD00E70590 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC59E9AC1D91C9DC001BDDF5;
-                       remoteInfo = DER_not_installed;
-               };
                6C98086C1E788AFD00E70590 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        remoteGlobalIDString = 6CF4A0DF1E4549F200ECD7B5;
                        remoteInfo = KeychainEntitledTestApp_ios;
                };
+               6C9A49B11FAB647D00239D58 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;
+               };
+               6CAA8CE41F82FD08007B6E03 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 6C9AA79D1F7C1D8F00D08296;
+                       remoteInfo = supdctl;
+               };
+               6CAA8CE81F82FD13007B6E03 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 6C9AA79D1F7C1D8F00D08296;
+                       remoteInfo = supdctl;
+               };
+               6CAA8D3C1F8431BC007B6E03 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 6CAA8D1F1F842FB3007B6E03;
+                       remoteInfo = supd;
+               };
+               6CAA8D3E1F8431C9007B6E03 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 6CAA8D1F1F842FB3007B6E03;
+                       remoteInfo = supd;
+               };
                ACBAF6FD1E941E090007BA2F /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        remoteGlobalIDString = D4ADA3181E2B41670031CEA3;
                        remoteInfo = libtrustd;
                };
-               D41257E31E941A8400781F23 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC59E9AC1D91C9DC001BDDF5;
-                       remoteInfo = DER_not_installed;
-               };
                D41257E51E941ACC00781F23 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        remoteGlobalIDString = 52D82BDD16A621F70078DFE5;
                        remoteInfo = CloudKeychainProxy;
                };
-               D41AD4591B978944008C7270 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 728B56A016D59979008FA3AB;
-                       remoteInfo = OTAPKIAssetTool;
-               };
                D41AD45B1B978A7A008C7270 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        remoteGlobalIDString = 5EBE24791B00CCAE0007DB0E;
                        remoteInfo = secacltests;
                };
-               D41AD4711B978F76008C7270 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 728B56A016D59979008FA3AB;
-                       remoteInfo = OTAPKIAssetTool;
-               };
                DA30D6811DF8C93500EC6B43 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
                        remoteInfo = SecureObjectSyncServer;
                };
-               DC0B62951D90B6DB00D43BCB /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC1785041D77873100B50D50;
-                       remoteInfo = copyHeadersToSystem;
-               };
                DC0BB4431ED4D74A0035F886 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        remoteGlobalIDString = DC222C371E034D1F00B09171;
                        remoteInfo = libsecurityd_ios_NO_AKS;
                };
-               DC3502C31E020D4D00BC0587 /* PBXContainerItemProxy */ = {
+               DC26710F1F3E933700816EED /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
                        remoteInfo = ASN1_not_installed;
                };
-               DC3502C61E020D5600BC0587 /* PBXContainerItemProxy */ = {
+               DC34CD2C20326C2C00302481 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
+                       remoteInfo = SecureObjectSyncServer;
+               };
+               DC34CD3320326C3100302481 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
+                       remoteInfo = SecureObjectSyncFramework;
+               };
+               DC34CD3520326C3B00302481 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = DC59E9AC1D91C9DC001BDDF5;
-                       remoteInfo = DER_not_installed;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;
+               };
+               DC3502C31E020D4D00BC0587 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
+                       remoteInfo = ASN1_not_installed;
                };
                DC3502CD1E020E2200BC0587 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        remoteGlobalIDString = 79DC33610D4E6EEA0039E4BC;
                        remoteInfo = libCMS;
                };
-               DC59EA401D91CAAA001BDDF5 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC59E9AC1D91C9DC001BDDF5;
-                       remoteInfo = DER;
-               };
-               DC59EA421D91CAAE001BDDF5 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC59EA0E1D91CA15001BDDF5;
-                       remoteInfo = DERUtils;
-               };
-               DC59EA541D91CAF0001BDDF5 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC59EA0E1D91CA15001BDDF5;
-                       remoteInfo = DERUtils;
-               };
-               DC59EA561D91CAF0001BDDF5 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC59E9AC1D91C9DC001BDDF5;
-                       remoteInfo = DER;
-               };
-               DC59EA661D91CB9F001BDDF5 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC59E9AC1D91C9DC001BDDF5;
-                       remoteInfo = DER;
-               };
-               DC59EA751D91CC5E001BDDF5 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC59E9AC1D91C9DC001BDDF5;
-                       remoteInfo = DER;
-               };
-               DC59EA781D91CC78001BDDF5 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC59E9AC1D91C9DC001BDDF5;
-                       remoteInfo = DER;
-               };
-               DC59EA7C1D91CCAA001BDDF5 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC59E9AC1D91C9DC001BDDF5;
-                       remoteInfo = DER;
-               };
-               DC59EA801D91CD16001BDDF5 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC59E9AC1D91C9DC001BDDF5;
-                       remoteInfo = DER;
-               };
-               DC59EA831D91CD2C001BDDF5 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC59E9AC1D91C9DC001BDDF5;
-                       remoteInfo = DER;
-               };
-               DC59EA861D91CD76001BDDF5 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC59E9AC1D91C9DC001BDDF5;
-                       remoteInfo = DER;
-               };
-               DC59EA891D91CD89001BDDF5 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC59E9AC1D91C9DC001BDDF5;
-                       remoteInfo = DER;
-               };
-               DC59EA8C1D91CDB9001BDDF5 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC59E9AC1D91C9DC001BDDF5;
-                       remoteInfo = DER;
-               };
-               DC59EA8F1D91CDC6001BDDF5 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC59E9AC1D91C9DC001BDDF5;
-                       remoteInfo = DER;
-               };
-               DC59EA921D91CDD6001BDDF5 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC59E9AC1D91C9DC001BDDF5;
-                       remoteInfo = DER;
-               };
-               DC59EA951D91CDEE001BDDF5 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC59E9AC1D91C9DC001BDDF5;
-                       remoteInfo = DER;
-               };
-               DC59EA981D91CE8C001BDDF5 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC59E9AC1D91C9DC001BDDF5;
-                       remoteInfo = DER;
-               };
                DC5ABE1B1D832F5E00CF422C /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        remoteGlobalIDString = DC5AC04F1D8352D900CF422C;
                        remoteInfo = securityd_macos;
                };
-               DC5AC1331D835C2300CF422C /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC1785041D77873100B50D50;
-                       remoteInfo = copyHeadersToSystem;
-               };
                DC61096A1D78E60C002223DE /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        remoteGlobalIDString = DC71D99F1D95BA6C0065FB93;
                        remoteInfo = ASN1;
                };
-               DC71D9FC1D95BB440065FB93 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC71D9E41D95BB0A0065FB93;
-                       remoteInfo = DER;
-               };
                DC71DA021D95BDEA0065FB93 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
                        remoteInfo = ASN1_not_installed;
                };
-               DC71DA081D95BEE00065FB93 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC59E9AC1D91C9DC001BDDF5;
-                       remoteInfo = DER_not_installed;
-               };
-               DC71DA0A1D95BEF60065FB93 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC59E9AC1D91C9DC001BDDF5;
-                       remoteInfo = DER_not_installed;
-               };
                DC71DA0C1D95DD670065FB93 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
                        remoteInfo = ASN1_not_installed;
                };
+               DCB332461F47857D00178C30 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52EC211D80CFB200B0A59C;
+                       remoteInfo = SOSCommands;
+               };
                DCB340181D8A248C0054D16E /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
                        remoteInfo = SecureObjectSyncFramework;
                };
+               DCDB29751FD8839F00B5D242 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 0C85DFD11FB38BB6000343A7;
+                       remoteInfo = OTTests_osx;
+               };
+               DCDB29771FD883AB00B5D242 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 0C85DFD11FB38BB6000343A7;
+                       remoteInfo = OTTests_osx;
+               };
                DCE4E6A91D7A38E700AFB96E /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        remoteGlobalIDString = DCE4E9101D7F3D5300AFB96E;
                        remoteInfo = "Keychain Circle Notification";
                };
+               DCE5DC161EA804E5006308A6 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52EC211D80CFB200B0A59C;
+                       remoteInfo = SOSCommands;
+               };
                DCF785001D88B80600E694BB /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
                        remoteInfo = SecureObjectSyncFramework;
                };
-               EBFBC2B71E76588200A34469 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC59E9AC1D91C9DC001BDDF5;
-                       remoteInfo = DER_not_installed;
-               };
                EBFBC2B91E76588A00A34469 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
+               0C85DFFD1FB38BB6000343A7 /* Embed OCMock */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = "";
+                       dstSubfolderSpec = 10;
+                       files = (
+                               0C85DFFE1FB38BB6000343A7 /* OCMock.framework in Embed OCMock */,
+                       );
+                       name = "Embed OCMock";
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               0C8BBF041FCB446400580909 /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1/;
+                       dstSubfolderSpec = 0;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
                470415CD1E5E14B5001F3D95 /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 2147483647;
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
-               6C0B0C481E2537E2007F95E5 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /System/Library/AWD/Metadata;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               6C0B0C491E253832007F95E5 /* AwdMetadata-0x60-Keychain.bin in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
-               };
                6C0B0C4A1E253840007F95E5 /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
                        name = "Install man8 page";
                        runOnlyForDeploymentPostprocessing = 1;
                };
+               6C9AA79C1F7C1D8F00D08296 /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1/;
+                       dstSubfolderSpec = 0;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               6CAA8D1E1F842FB3007B6E03 /* Copy Manpage */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1/;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               6CDB600F1FA92D2B00410924 /* securityuploadd.8 in Copy Manpage */,
+                       );
+                       name = "Copy Manpage";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
                6CCDF7821E3C25FA003F2555 /* Copy BATS Test Discovery plist */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
-               DC17886F1D77934100B50D50 /* Copy SecurityObjectSync Headers */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = PrivateHeaders/SecureObjectSync;
-                       dstSubfolderSpec = 1;
-                       files = (
-                               DC3C72E81D8376F900F6A832 /* SOSViews.h in Copy SecurityObjectSync Headers */,
-                               DC3C72E71D8376F300F6A832 /* SOSPeerInfo.h in Copy SecurityObjectSync Headers */,
-                               DC3C72E61D8376EC00F6A832 /* SOSCloudCircleInternal.h in Copy SecurityObjectSync Headers */,
-                               DC3C72E51D8376E600F6A832 /* SOSCloudCircle.h in Copy SecurityObjectSync Headers */,
-                               DC3C72E41D8376DE00F6A832 /* SOSBackupSliceKeyBag.h in Copy SecurityObjectSync Headers */,
-                               DC3C72E31D8376D700F6A832 /* SOSTypes.h in Copy SecurityObjectSync Headers */,
-                       );
-                       name = "Copy SecurityObjectSync Headers";
-                       runOnlyForDeploymentPostprocessing = 1;
-               };
                DC1789E81D77A0E700B50D50 /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 2147483647;
                        dstPath = en.lproj;
                        dstSubfolderSpec = 7;
                        files = (
+                               D479F6E31F981FD600388D28 /* OID.strings in CopyFiles */,
+                               D479F6E41F981FD600388D28 /* Certificate.strings in CopyFiles */,
+                               D479F6E51F981FD600388D28 /* Trust.strings in CopyFiles */,
                                DC1789E91D77A0F300B50D50 /* CloudKeychain.strings in CopyFiles */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
-               DC59EA351D91CA82001BDDF5 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /usr/share/man/man1/;
-                       dstSubfolderSpec = 0;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
-               };
-               DC59EA5C1D91CAF0001BDDF5 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /usr/share/man/man1/;
-                       dstSubfolderSpec = 0;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
-               };
-               DC59EA6C1D91CB9F001BDDF5 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /usr/share/man/man1/;
-                       dstSubfolderSpec = 0;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
-               };
                DC5ABDC31D832DAB00CF422C /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 2147483647;
                        name = "Install launchd plist";
                        runOnlyForDeploymentPostprocessing = 1;
                };
-               E73288DD1AED7215008CE839 /* Copy SecureObjectSync Headers */ = {
+               DCF7F5D11F69AC28001042E9 /* Copy SecureObjectSync Headers */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 2147483647;
                        dstPath = PrivateHeaders/SecureObjectSync;
                                DC3C72ED1D83778100F6A832 /* SOSViews.h in Copy SecureObjectSync Headers */,
                                DC3C72EC1D83777B00F6A832 /* SOSPeerInfo.h in Copy SecureObjectSync Headers */,
                                DC3C72EB1D83777600F6A832 /* SOSCloudCircle.h in Copy SecureObjectSync Headers */,
-                               DC3C72EA1D83777100F6A832 /* SOSPeerInfoV2.h in Copy SecureObjectSync Headers */,
                                DC3C72E91D83776B00F6A832 /* SOSBackupSliceKeyBag.h in Copy SecureObjectSync Headers */,
                        );
                        name = "Copy SecureObjectSync Headers";
                        runOnlyForDeploymentPostprocessing = 0;
                };
+               E73288DD1AED7215008CE839 /* Copy SecureObjectSync Headers */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = PrivateHeaders/SecureObjectSync;
+                       dstSubfolderSpec = 1;
+                       files = (
+                               DC8EB58D1F70743100080CF2 /* SOSPeerInfoV2.h in Copy SecureObjectSync Headers */,
+                               DCDD59CC1F69ACF70060641E /* SOSCloudCircleInternal.h in Copy SecureObjectSync Headers */,
+                               DCDD59CD1F69ACF70060641E /* SOSTypes.h in Copy SecureObjectSync Headers */,
+                               DCDD59CE1F69ACF70060641E /* SOSViews.h in Copy SecureObjectSync Headers */,
+                               DCDD59CF1F69ACF70060641E /* SOSPeerInfo.h in Copy SecureObjectSync Headers */,
+                               DCDD59D01F69ACF70060641E /* SOSCloudCircle.h in Copy SecureObjectSync Headers */,
+                               DCDD59D21F69ACF70060641E /* SOSBackupSliceKeyBag.h in Copy SecureObjectSync Headers */,
+                       );
+                       name = "Copy SecureObjectSync Headers";
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                E7CFF7211C86602B00E3484E /* Install BATS Tests */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
+               EB49B30E202FF484003F34A0 /* Embedded OCMock */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = "";
+                       dstSubfolderSpec = 10;
+                       files = (
+                               EB49B310202FF4AC003F34A0 /* OCMock.framework in Embedded OCMock */,
+                       );
+                       name = "Embedded OCMock";
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                EB76B7561DCB0C6900C43FBC /* Install man8 page */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
                0C0C88771CCEC5BD00617D1B /* si-82-sectrust-ct-data */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "si-82-sectrust-ct-data"; path = "../OSX/shared_regressions/si-82-sectrust-ct-data"; sourceTree = "<group>"; };
                0C0CEC9D1DA45EA200C22FBC /* recovery_key.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = recovery_key.h; sourceTree = "<group>"; };
                0C0CEC9E1DA45EA200C22FBC /* recovery_key.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = recovery_key.m; sourceTree = "<group>"; };
+               0C16371F1FD12F1500210823 /* OTCloudStoreTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OTCloudStoreTests.m; path = ot/tests/OTCloudStoreTests.m; sourceTree = "<group>"; };
                0C2BCBA51D063F7D00ED7A2F /* dtlsEchoClient.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = dtlsEchoClient.c; sourceTree = "<group>"; };
                0C2BCBA61D063F7D00ED7A2F /* dtlsEchoServer.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = dtlsEchoServer.c; sourceTree = "<group>"; };
                0C2BCBA71D063F7D00ED7A2F /* README */ = {isa = PBXFileReference; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
                0C2BCBB91D06401F00ED7A2F /* dtlsEchoClient */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = dtlsEchoClient; sourceTree = BUILT_PRODUCTS_DIR; };
                0C2BCBCE1D0648D100ED7A2F /* dtlsEchoServer */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = dtlsEchoServer; sourceTree = BUILT_PRODUCTS_DIR; };
+               0C36B3172007EE6C0029F7A2 /* OTPreflightInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OTPreflightInfo.m; path = ot/OTPreflightInfo.m; sourceTree = "<group>"; };
+               0C36B3202007EE9B0029F7A2 /* OTPreflightInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OTPreflightInfo.h; path = ot/OTPreflightInfo.h; sourceTree = "<group>"; };
                0C3C00721EF3636300AB19FE /* secd-155-otr-negotiation-monitor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-155-otr-negotiation-monitor.m"; sourceTree = "<group>"; };
+               0C46A57A2035019800F17112 /* OTLockStateNetworkingTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OTLockStateNetworkingTests.m; path = ot/tests/OTLockStateNetworkingTests.m; sourceTree = "<group>"; };
                0C48990A1E0E0FF300C6CF70 /* SOSTransportCircleCK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSTransportCircleCK.h; sourceTree = "<group>"; };
                0C4899111E0E105D00C6CF70 /* SOSTransportCircleCK.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SOSTransportCircleCK.m; sourceTree = "<group>"; };
                0C48991B1E0F384700C6CF70 /* SOSAccountTrustClassic.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SOSAccountTrustClassic.m; path = SecureObjectSync/SOSAccountTrustClassic.m; sourceTree = "<group>"; };
                0C4899221E0F386900C6CF70 /* SOSAccountTrustClassic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SOSAccountTrustClassic.h; path = SecureObjectSync/SOSAccountTrustClassic.h; sourceTree = "<group>"; };
                0C4899241E0F38FA00C6CF70 /* SOSAccountTrustOctagon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SOSAccountTrustOctagon.m; path = SecureObjectSync/SOSAccountTrustOctagon.m; sourceTree = "<group>"; };
                0C4899261E0F399B00C6CF70 /* SOSAccountTrustOctagon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SOSAccountTrustOctagon.h; path = SecureObjectSync/SOSAccountTrustOctagon.h; sourceTree = "<group>"; };
+               0C52C1FE20003BCA003F0733 /* OTTestsBase.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OTTestsBase.m; path = ot/tests/OTTestsBase.m; sourceTree = "<group>"; };
+               0C52C20520004248003F0733 /* OTTestsBase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OTTestsBase.h; path = ot/tests/OTTestsBase.h; sourceTree = "<group>"; };
+               0C5CFB37201960FF00913B9C /* OTRamping.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OTRamping.m; path = ot/OTRamping.m; sourceTree = "<group>"; };
+               0C5CFB3F201962FF00913B9C /* OTRamping.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OTRamping.h; path = ot/OTRamping.h; sourceTree = "<group>"; };
+               0C5F4FD71F952FEA00AF1616 /* secd-700-sftm.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "secd-700-sftm.m"; sourceTree = "<group>"; };
                0C664AB2175926B20092D3D9 /* secdtests-entitlements.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "secdtests-entitlements.plist"; sourceTree = "<group>"; };
+               0C770EC31FCF7E2000B5F0E2 /* OTCloudStore.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OTCloudStore.m; path = ot/OTCloudStore.m; sourceTree = "<group>"; };
                0C78F1C916A5E13400654E08 /* sectask_regressions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sectask_regressions.h; sourceTree = "<group>"; };
                0C78F1CA16A5E1BF00654E08 /* sectask-10-sectask.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sectask-10-sectask.c"; sourceTree = "<group>"; };
                0C78F1CB16A5E1BF00654E08 /* sectask_ipc.defs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.mig; path = sectask_ipc.defs; sourceTree = "<group>"; };
+               0C85E0031FB38BB6000343A7 /* OTTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OTTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+               0C85E0041FB38BB7000343A7 /* OTTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = "OTTests-Info.plist"; path = "/Users/ma/git/security/OTTests-Info.plist"; sourceTree = "<absolute>"; };
+               0C8A03451FDF42BA0042E8BE /* OTEscrowKeyTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OTEscrowKeyTests.m; path = ot/tests/OTEscrowKeyTests.m; sourceTree = "<group>"; };
+               0C8A034C1FDF4CCE0042E8BE /* OTLocalStoreTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OTLocalStoreTests.m; path = ot/tests/OTLocalStoreTests.m; sourceTree = "<group>"; };
+               0C8A034E1FDF60070042E8BE /* OTBottledPeerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OTBottledPeerTests.m; path = ot/tests/OTBottledPeerTests.m; sourceTree = "<group>"; };
+               0C8BBE891FC9DA5200580909 /* OTCloudStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OTCloudStore.h; path = ot/OTCloudStore.h; sourceTree = "<group>"; };
+               0C8BBE8A1FC9DA5300580909 /* OTIdentity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OTIdentity.h; path = ot/OTIdentity.h; sourceTree = "<group>"; };
+               0C8BBE8B1FC9DA5300580909 /* OTContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OTContext.h; path = ot/OTContext.h; sourceTree = "<group>"; };
+               0C8BBE8C1FC9DA5400580909 /* OTLocalStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OTLocalStore.m; path = ot/OTLocalStore.m; sourceTree = "<group>"; };
+               0C8BBE8D1FC9DA5400580909 /* OTIdentity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OTIdentity.m; path = ot/OTIdentity.m; sourceTree = "<group>"; };
+               0C8BBE8E1FC9DA5500580909 /* OTLocalStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OTLocalStore.h; path = ot/OTLocalStore.h; sourceTree = "<group>"; };
+               0C8BBE921FC9DA5700580909 /* OTEscrowKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OTEscrowKeys.h; path = ot/OTEscrowKeys.h; sourceTree = "<group>"; };
+               0C8BBE931FC9DA5700580909 /* OTBottledPeer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OTBottledPeer.m; path = ot/OTBottledPeer.m; sourceTree = "<group>"; };
+               0C8BBE951FC9DA5800580909 /* OTBottledPeer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OTBottledPeer.h; path = ot/OTBottledPeer.h; sourceTree = "<group>"; };
+               0C8BBE961FC9DA5900580909 /* OTEscrowKeys.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OTEscrowKeys.m; path = ot/OTEscrowKeys.m; sourceTree = "<group>"; };
+               0C8BBE971FC9DA5A00580909 /* OTDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OTDefines.h; path = ot/OTDefines.h; sourceTree = "<group>"; };
+               0C8BBE981FC9DA5A00580909 /* OTContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OTContext.m; path = ot/OTContext.m; sourceTree = "<group>"; };
+               0C8BBEAF1FC9DCA400580909 /* OTContextTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OTContextTests.m; path = ot/tests/OTContextTests.m; sourceTree = "<group>"; };
+               0C8BBEF71FCB405700580909 /* otctl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = otctl.m; sourceTree = "<group>"; };
+               0C8BBEF81FCB407700580909 /* otctl-Entitlements.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "otctl-Entitlements.plist"; sourceTree = "<group>"; };
+               0C8BBF081FCB446400580909 /* otctl */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = otctl; sourceTree = BUILT_PRODUCTS_DIR; };
+               0C8BBF0B1FCB452200580909 /* OTControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OTControl.h; path = ot/OTControl.h; sourceTree = "<group>"; };
+               0C8BBF0C1FCB452200580909 /* OTControlProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OTControlProtocol.h; path = ot/OTControlProtocol.h; sourceTree = "<group>"; };
+               0C8BBF0D1FCB452300580909 /* OTControlProtocol.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OTControlProtocol.m; path = ot/OTControlProtocol.m; sourceTree = "<group>"; };
+               0C8BBF0E1FCB452400580909 /* OTControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OTControl.m; path = ot/OTControl.m; sourceTree = "<group>"; };
+               0C8BBF0F1FCB481800580909 /* OTManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OTManager.m; path = ot/OTManager.m; sourceTree = "<group>"; };
+               0C8BBF101FCB486B00580909 /* OTManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OTManager.h; path = ot/OTManager.h; sourceTree = "<group>"; };
+               0CA4EBF1202B8D1C002B1D96 /* CloudKitKeychainSyncingTestsBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CloudKitKeychainSyncingTestsBase.h; sourceTree = "<group>"; };
+               0CA4EBF2202B8D1D002B1D96 /* CloudKitKeychainSyncingTestsBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CloudKitKeychainSyncingTestsBase.m; sourceTree = "<group>"; };
                0CAC5DBE1EB3DA4C00AD884B /* SOSPeerRateLimiter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SOSPeerRateLimiter.m; sourceTree = "<group>"; };
                0CAC5DC51EB3DB3C00AD884B /* SOSPeerRateLimiter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSPeerRateLimiter.h; sourceTree = "<group>"; };
                0CAD1E221E032D4000537693 /* AggregateDictionary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AggregateDictionary.framework; path = "../../Library/Developer/Xcode/iOS DeviceSupport/11.0 (15A168)/Symbols/System/Library/PrivateFrameworks/AggregateDictionary.framework"; sourceTree = "<group>"; };
                0CB321F01464A95F00587CD3 /* CreateCerts.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = CreateCerts.sh; sourceTree = "<group>"; };
+               0CB975502023B199008D6B48 /* OTRampingTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OTRampingTests.m; path = ot/tests/OTRampingTests.m; sourceTree = "<group>"; };
+               0CBDF64C1FFC951200433E0D /* OTBottledPeerTLK.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OTBottledPeerTLK.m; path = ot/tests/OTBottledPeerTLK.m; sourceTree = "<group>"; };
+               0CCCC7C720261D050024405E /* OT.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OT.h; path = ot/OT.h; sourceTree = "<group>"; };
+               0CCCC7C820261D310024405E /* OT.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OT.m; path = ot/OT.m; sourceTree = "<group>"; };
                0CCDE7161EEB08220021A946 /* secd-156-timers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "secd-156-timers.m"; sourceTree = "<group>"; };
                0CD8CB041ECA50780076F37F /* SOSPeerOTRTimer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SOSPeerOTRTimer.m; sourceTree = "<group>"; };
                0CD8CB0C1ECA50D10076F37F /* SOSPeerOTRTimer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSPeerOTRTimer.h; sourceTree = "<group>"; };
+               0CD9E7FF1FE05B6600F66C38 /* OTContextRecord.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OTContextRecord.m; path = ot/OTContextRecord.m; sourceTree = "<group>"; };
+               0CD9E8071FE05B8700F66C38 /* OTContextRecord.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OTContextRecord.h; path = ot/OTContextRecord.h; sourceTree = "<group>"; };
+               0CE1BCC61FCE11480017230E /* OTBottledPeerSigned.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OTBottledPeerSigned.m; path = ot/OTBottledPeerSigned.m; sourceTree = "<group>"; };
+               0CE1BCCD1FCE11610017230E /* OTBottledPeerSigned.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OTBottledPeerSigned.h; path = ot/OTBottledPeerSigned.h; sourceTree = "<group>"; };
+               0CE407AB1FD4769B00F59B31 /* OTCloudStoreState.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OTCloudStoreState.m; path = ot/OTCloudStoreState.m; sourceTree = "<group>"; };
+               0CE407B31FD476E000F59B31 /* OTCloudStoreState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OTCloudStoreState.h; path = ot/OTCloudStoreState.h; sourceTree = "<group>"; };
                0CE760471E12F2F200B4381E /* SOSAccountTrustClassic+Expansion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "SOSAccountTrustClassic+Expansion.m"; path = "SecureObjectSync/SOSAccountTrustClassic+Expansion.m"; sourceTree = "<group>"; };
                0CE760491E12F30200B4381E /* SOSAccountTrustClassic+Circle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "SOSAccountTrustClassic+Circle.m"; path = "SecureObjectSync/SOSAccountTrustClassic+Circle.m"; sourceTree = "<group>"; };
                0CE7604B1E12F56800B4381E /* SOSAccountTrustClassic+Identity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "SOSAccountTrustClassic+Identity.m"; path = "SecureObjectSync/SOSAccountTrustClassic+Identity.m"; sourceTree = "<group>"; };
                0CE760511E1314F700B4381E /* SOSAccountTrustClassic+Identity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SOSAccountTrustClassic+Identity.h"; path = "SecureObjectSync/SOSAccountTrustClassic+Identity.h"; sourceTree = "<group>"; };
                0CE760531E13155100B4381E /* SOSAccountTrustClassic+Circle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SOSAccountTrustClassic+Circle.h"; path = "SecureObjectSync/SOSAccountTrustClassic+Circle.h"; sourceTree = "<group>"; };
                0CE760551E1316E900B4381E /* SOSAccountTrustClassic+Retirement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SOSAccountTrustClassic+Retirement.h"; path = "SecureObjectSync/SOSAccountTrustClassic+Retirement.h"; sourceTree = "<group>"; };
+               0CE98B5B1FA9360700CF1D54 /* libprequelite.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libprequelite.tbd; path = usr/lib/libprequelite.tbd; sourceTree = SDKROOT; };
+               0CE98BAD1FA93AA900CF1D54 /* CKKSTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = "CKKSTests-Info.plist"; path = "/Volumes/Data/ma/git/security/CKKSTests-Info.plist"; sourceTree = "<absolute>"; };
+               0CF0E2E31F8EE3B000BD18E4 /* SFTransactionMetric.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFTransactionMetric.m; sourceTree = "<group>"; };
+               0CF0E2E71F8EE40700BD18E4 /* SFTransactionMetric.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFTransactionMetric.h; sourceTree = "<group>"; };
                0CFC029B1D41650700E6283B /* libcoretls.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcoretls.dylib; path = usr/lib/libcoretls.dylib; sourceTree = SDKROOT; };
                107226D00D91DB32003CF14F /* SecTask.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecTask.c; sourceTree = "<group>"; };
                107226D10D91DB32003CF14F /* SecTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecTask.h; path = sectask/SecTask.h; sourceTree = "<group>"; };
                18351B8F14CB65870097860E /* SecBase64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecBase64.h; sourceTree = "<group>"; };
                225394B41E3080A600D3CD9B /* libsecurity_codesigning_ios.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsecurity_codesigning_ios.a; sourceTree = BUILT_PRODUCTS_DIR; };
                2281820D17B4686C0067C9C9 /* BackgroundTaskAgent.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BackgroundTaskAgent.framework; path = System/Library/PrivateFrameworks/BackgroundTaskAgent.framework; sourceTree = SDKROOT; };
-               22C002A31AC9D33100B3469E /* OTAPKIAssetTool.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = OTAPKIAssetTool.xcconfig; sourceTree = "<group>"; };
                24CBF8731E9D4E4500F09F0E /* kc-44-secrecoverypassword.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "kc-44-secrecoverypassword.c"; path = "regressions/kc-44-secrecoverypassword.c"; sourceTree = "<group>"; };
                433E519D1B66D5F600482618 /* AppSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppSupport.framework; path = System/Library/PrivateFrameworks/AppSupport.framework; sourceTree = SDKROOT; };
                4381690C1B4EDCBD00C54D58 /* SOSCCAuthPlugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SOSCCAuthPlugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
                470415CF1E5E14B5001F3D95 /* seckeychainnetworkextensionstest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = seckeychainnetworkextensionstest; sourceTree = BUILT_PRODUCTS_DIR; };
                470415DB1E5E1534001F3D95 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = RegressionTests/seckeychainnetworkextensionstest/main.m; sourceTree = SOURCE_ROOT; };
                470415DD1E5E15B3001F3D95 /* seckeychainnetworkextensionstest.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; name = seckeychainnetworkextensionstest.entitlements; path = RegressionTests/seckeychainnetworkextensionstest/seckeychainnetworkextensionstest.entitlements; sourceTree = SOURCE_ROOT; };
+               470ACEF21F58C3A600D1D5BD /* SecDbKeychainItemV7.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecDbKeychainItemV7.h; sourceTree = "<group>"; };
+               470ACEF31F58C3A600D1D5BD /* SecDbKeychainItemV7.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecDbKeychainItemV7.m; sourceTree = "<group>"; };
                471024D91E79CB6D00844C09 /* CKKSTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSTests.h; sourceTree = "<group>"; };
+               472339611FD7155C00CB6A72 /* libprequelite.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libprequelite.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.0.Internal.sdk/usr/lib/libprequelite.dylib; sourceTree = DEVELOPER_DIR; };
+               472339681FD7156700CB6A72 /* CoreCDP.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreCDP.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.0.Internal.sdk/System/Library/PrivateFrameworks/CoreCDP.framework; sourceTree = DEVELOPER_DIR; };
                4723C9BC1F152EB10082882F /* SFSQLite.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFSQLite.m; sourceTree = "<group>"; };
                4723C9BD1F152EB10082882F /* SFSQLite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFSQLite.h; sourceTree = "<group>"; };
                4723C9BE1F152EB10082882F /* SFObjCType.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFObjCType.m; sourceTree = "<group>"; };
                4723C9C01F152EB10082882F /* SFObjCType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFObjCType.h; sourceTree = "<group>"; };
                4723C9C11F152EB10082882F /* SFSQLiteStatement.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFSQLiteStatement.h; sourceTree = "<group>"; };
                4723C9D11F1531970082882F /* CKKSLoggerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSLoggerTests.m; sourceTree = "<group>"; };
-               4723C9DA1F1540CE0082882F /* SFAnalyticsLogger.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFAnalyticsLogger.h; sourceTree = "<group>"; };
-               4723C9DB1F1540CE0082882F /* SFAnalyticsLogger.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFAnalyticsLogger.m; sourceTree = "<group>"; };
+               4723C9DA1F1540CE0082882F /* SFAnalytics.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFAnalytics.h; sourceTree = "<group>"; };
+               4723C9DB1F1540CE0082882F /* SFAnalytics.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFAnalytics.m; sourceTree = "<group>"; };
+               4727FBB71F9918580003AE36 /* secdxctests_ios.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = secdxctests_ios.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+               4727FBB91F9918590003AE36 /* KeychainCryptoTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KeychainCryptoTests.m; sourceTree = "<group>"; };
+               4727FBBB1F9918590003AE36 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+               4727FBC41F991C460003AE36 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
+               4727FBCA1F991F510003AE36 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
+               4727FBCC1F991F660003AE36 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/usr/lib/libsqlite3.dylib; sourceTree = DEVELOPER_DIR; };
+               4727FBCF1F991F820003AE36 /* SecurityFoundation.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SecurityFoundation.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+               4727FBD01F991F990003AE36 /* libMobileGestalt.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libMobileGestalt.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/usr/lib/libMobileGestalt.dylib; sourceTree = DEVELOPER_DIR; };
+               4727FBD21F9920290003AE36 /* CloudKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CloudKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/CloudKit.framework; sourceTree = DEVELOPER_DIR; };
+               4727FBD41F9920510003AE36 /* ProtocolBuffer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ProtocolBuffer.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.Internal.sdk/System/Library/PrivateFrameworks/ProtocolBuffer.framework; sourceTree = DEVELOPER_DIR; };
+               4727FBD81F9920BB0003AE36 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.Internal.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; };
+               4727FBDA1F9920CB0003AE36 /* WirelessDiagnostics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WirelessDiagnostics.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.Internal.sdk/System/Library/PrivateFrameworks/WirelessDiagnostics.framework; sourceTree = DEVELOPER_DIR; };
+               4727FBDC1F9920F10003AE36 /* libaks_acl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libaks_acl.a; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.Internal.sdk/usr/local/lib/libaks_acl.a; sourceTree = DEVELOPER_DIR; };
+               4727FBDE1F99211D0003AE36 /* libaks.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libaks.a; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.Internal.sdk/usr/local/lib/libaks.a; sourceTree = DEVELOPER_DIR; };
+               4727FBE01F99212F0003AE36 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.Internal.sdk/System/Library/Frameworks/IOKit.framework; sourceTree = DEVELOPER_DIR; };
+               4727FBE21F9921660003AE36 /* MobileKeyBag.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileKeyBag.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.Internal.sdk/System/Library/PrivateFrameworks/MobileKeyBag.framework; sourceTree = DEVELOPER_DIR; };
+               4727FBE41F99217A0003AE36 /* SharedWebCredentials.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SharedWebCredentials.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.Internal.sdk/System/Library/PrivateFrameworks/SharedWebCredentials.framework; sourceTree = DEVELOPER_DIR; };
+               4727FBE61F9921890003AE36 /* ApplePushService.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplePushService.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.Internal.sdk/System/Library/PrivateFrameworks/ApplePushService.framework; sourceTree = DEVELOPER_DIR; };
+               4727FBE81F9921D00003AE36 /* libACM.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libACM.a; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.Internal.sdk/usr/local/lib/libACM.a; sourceTree = DEVELOPER_DIR; };
+               473337771FDAFBCC00E19F30 /* SFKeychainControlManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFKeychainControlManager.h; sourceTree = "<group>"; };
+               473337781FDAFBCC00E19F30 /* SFKeychainControlManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFKeychainControlManager.m; sourceTree = "<group>"; };
+               473337821FDB29A200E19F30 /* KeychainCheck.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KeychainCheck.h; sourceTree = "<group>"; };
+               473337831FDB29A200E19F30 /* KeychainCheck.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KeychainCheck.m; sourceTree = "<group>"; };
                4738AE241E732D7E006BD53D /* SharedWebCredentials.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SharedWebCredentials.framework; path = System/Library/PrivateFrameworks/SharedWebCredentials.framework; sourceTree = SDKROOT; };
                474B5FBF1E662E21007546F8 /* SecurityFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SecurityFoundation.framework; path = ../../Builds/iphoneos11.0.internal/SecurityFoundation.framework; sourceTree = "<group>"; };
-               475F371F1EE8F23900248FB5 /* SFAnalyticsLogging.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = SFAnalyticsLogging.plist; sourceTree = "<group>"; };
+               475F371F1EE8F23900248FB5 /* SFAnalytics.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = SFAnalytics.plist; sourceTree = "<group>"; };
                476541631F339F6300413F65 /* SecdWatchdog.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecdWatchdog.h; sourceTree = "<group>"; };
                476541641F339F6300413F65 /* SecdWatchdog.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecdWatchdog.m; sourceTree = "<group>"; };
                476D87391E6750E200190352 /* CKKSManifestLeafRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSManifestLeafRecord.h; sourceTree = "<group>"; };
                47702B2E1E5F492C00B29577 /* seckeychainnetworkextensionunauthorizedaccesstest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = seckeychainnetworkextensionunauthorizedaccesstest; sourceTree = BUILT_PRODUCTS_DIR; };
                47702B351E5F495C00B29577 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = RegressionTests/seckeychainnetworkextensionunauthorizedaccesstest/main.m; sourceTree = SOURCE_ROOT; };
                47702B381E5F499A00B29577 /* seckeychainnetworkextensionunauthorizedaccesstest.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; name = seckeychainnetworkextensionunauthorizedaccesstest.entitlements; path = RegressionTests/seckeychainnetworkextensionunauthorizedaccesstest/seckeychainnetworkextensionunauthorizedaccesstest.entitlements; sourceTree = SOURCE_ROOT; };
-               479108B51EE879F9008CEFA0 /* CKKSAnalyticsLogger.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CKKSAnalyticsLogger.h; path = ckks/CKKSAnalyticsLogger.h; sourceTree = "<group>"; };
-               479108B61EE879F9008CEFA0 /* CKKSAnalyticsLogger.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = CKKSAnalyticsLogger.m; path = ckks/CKKSAnalyticsLogger.m; sourceTree = "<group>"; };
+               477A1F4C20320E4900ACD81D /* Accounts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accounts.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.Internal.sdk/System/Library/Frameworks/Accounts.framework; sourceTree = DEVELOPER_DIR; };
+               477A1FE1203763A500ACD81D /* KeychainAPITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KeychainAPITests.m; sourceTree = "<group>"; };
+               477A1FEB2037A0E000ACD81D /* KeychainXCTest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KeychainXCTest.h; sourceTree = "<group>"; };
+               477A1FEC2037A0E000ACD81D /* KeychainXCTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KeychainXCTest.m; sourceTree = "<group>"; };
+               478D429C1FD72A8100CAB645 /* secdxctests_mac.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = secdxctests_mac.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+               479108B51EE879F9008CEFA0 /* CKKSAnalytics.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CKKSAnalytics.h; path = ckks/CKKSAnalytics.h; sourceTree = "<group>"; };
+               479108B61EE879F9008CEFA0 /* CKKSAnalytics.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = CKKSAnalytics.m; path = ckks/CKKSAnalytics.m; sourceTree = "<group>"; };
+               47922D171FAA65120008F7E0 /* SecDbKeychainAKSSerializedWrappedKey.proto */ = {isa = PBXFileReference; lastKnownFileType = text; path = SecDbKeychainAKSSerializedWrappedKey.proto; sourceTree = "<group>"; };
+               47922D201FAA75FF0008F7E0 /* SecDbKeychainSerializedMetadata.proto */ = {isa = PBXFileReference; lastKnownFileType = text; path = SecDbKeychainSerializedMetadata.proto; sourceTree = "<group>"; };
+               47922D2C1FAA77970008F7E0 /* SecDbKeychainSerializedSecretData.proto */ = {isa = PBXFileReference; lastKnownFileType = text; path = SecDbKeychainSerializedSecretData.proto; sourceTree = "<group>"; };
+               47922D361FAA7C030008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecDbKeychainSerializedAKSWrappedKey.m; sourceTree = "<group>"; };
+               47922D371FAA7C040008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecDbKeychainSerializedAKSWrappedKey.h; sourceTree = "<group>"; };
+               47922D3A1FAA7C0F0008F7E0 /* SecDbKeychainSerializedMetadata.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecDbKeychainSerializedMetadata.m; sourceTree = "<group>"; };
+               47922D3B1FAA7C100008F7E0 /* SecDbKeychainSerializedMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecDbKeychainSerializedMetadata.h; sourceTree = "<group>"; };
+               47922D3E1FAA7C1A0008F7E0 /* SecDbKeychainSerializedSecretData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecDbKeychainSerializedSecretData.h; sourceTree = "<group>"; };
+               47922D3F1FAA7C1B0008F7E0 /* SecDbKeychainSerializedSecretData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecDbKeychainSerializedSecretData.m; sourceTree = "<group>"; };
+               47922D4E1FAA7D5C0008F7E0 /* SecDbKeychainSerializedItemV7.proto */ = {isa = PBXFileReference; lastKnownFileType = text; path = SecDbKeychainSerializedItemV7.proto; sourceTree = "<group>"; };
+               47922D501FAA7DF60008F7E0 /* SecDbKeychainSerializedItemV7.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecDbKeychainSerializedItemV7.h; sourceTree = "<group>"; };
+               47922D511FAA7DF70008F7E0 /* SecDbKeychainSerializedItemV7.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecDbKeychainSerializedItemV7.m; sourceTree = "<group>"; };
+               47A05B101FDB5A8B00D0816E /* SFKeychainControl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFKeychainControl.h; sourceTree = "<group>"; };
                47C51B841EEA657D0032D9E5 /* SecurityUnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SecurityUnitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
                47C51B861EEA657D0032D9E5 /* SecurityUnitTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecurityUnitTests.m; sourceTree = "<group>"; };
                47C51B881EEA657D0032D9E5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                47CEED1E1E60DE900044EAB4 /* CKKSManifest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSManifest.h; sourceTree = "<group>"; };
                47CEED1F1E60DE900044EAB4 /* CKKSManifest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSManifest.m; sourceTree = "<group>"; };
+               47D1838B1FB3827700CFCD89 /* OCMock.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OCMock.framework; path = Platforms/iPhoneOS.platform/Developer/AppleInternal/Library/Frameworks/OCMock.framework; sourceTree = DEVELOPER_DIR; };
                48284A041D1DB06E00C76CB7 /* README_os_log_prefs.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README_os_log_prefs.txt; path = OSX/sec/os_log/README_os_log_prefs.txt; sourceTree = "<group>"; };
                483E79891DC875F2005C0008 /* secd-67-prefixedKeyIDs.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "secd-67-prefixedKeyIDs.m"; sourceTree = "<group>"; };
                485B64081DC16E8300B771B9 /* SOSKeyedPubKeyIdentifier.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSKeyedPubKeyIdentifier.c; sourceTree = "<group>"; };
                4CEF4CA70C5551FE00062475 /* SecCertificateInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCertificateInternal.h; sourceTree = "<group>"; };
                4CF0484A0A5D988F00268236 /* SecItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecItem.h; path = keychain/SecItem.h; sourceTree = "<group>"; };
                4CF0487F0A5F016300268236 /* SecItemPriv.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SecItemPriv.h; path = keychain/SecItemPriv.h; sourceTree = "<group>"; };
-               4CF41D0A0BBB4022005F3248 /* SecCertificatePath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCertificatePath.h; sourceTree = "<group>"; };
                4CF4C19C171E0EA600877419 /* Accounts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accounts.framework; path = System/Library/Frameworks/Accounts.framework; sourceTree = SDKROOT; };
                4CF730310EF9CDE300E17471 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
                4CFBF5F10D5A92E100969BBE /* SecPolicyInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecPolicyInternal.h; sourceTree = "<group>"; };
                5346481C173322BD00FE9172 /* KeychainSyncAccountNotification.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeychainSyncAccountNotification.h; sourceTree = "<group>"; };
                5346481D173322BD00FE9172 /* KeychainSyncAccountNotification.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KeychainSyncAccountNotification.m; sourceTree = "<group>"; };
                53C0E1F2177FAC2C00F8A018 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/CloudKeychain.strings; sourceTree = "<group>"; };
-               5DDD0BDD16D6740E00D6C0D6 /* com.apple.OTAPKIAssetTool.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = com.apple.OTAPKIAssetTool.plist; sourceTree = "<group>"; };
-               5DDD0BDE16D6740E00D6C0D6 /* OTAPKIAssetTool-entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "OTAPKIAssetTool-entitlements.plist"; sourceTree = "<group>"; };
+               5A94C6D1203CC1C60066E391 /* AOSAccountsLite.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AOSAccountsLite.framework; path = System/Library/PrivateFrameworks/AOSAccountsLite.framework; sourceTree = SDKROOT; };
+               5A94C6D4203CC2590066E391 /* AuthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AuthKit.framework; path = System/Library/PrivateFrameworks/AuthKit.framework; sourceTree = SDKROOT; };
                5E10992519A5E55800A60E2B /* ISACLProtectedItems.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ISACLProtectedItems.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
                5E10992919A5E55800A60E2B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                5E10994E19A5E5CE00A60E2B /* ISProtectedItems.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = ISProtectedItems.plist; sourceTree = "<group>"; };
                5EBE247C1B00CCAE0007DB0E /* main.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
                6C0B0C3D1E2537C6007F95E5 /* WirelessDiagnostics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WirelessDiagnostics.framework; path = System/Library/PrivateFrameworks/WirelessDiagnostics.framework; sourceTree = SDKROOT; };
                6C0B0C441E2537CC007F95E5 /* ProtocolBuffer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ProtocolBuffer.framework; path = System/Library/PrivateFrameworks/ProtocolBuffer.framework; sourceTree = SDKROOT; };
+               6C1260F21F7D5F25001B2EEC /* securityuploadd-osx.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "securityuploadd-osx.plist"; sourceTree = "<group>"; };
+               6C1260FA1F7D631D001B2EEC /* securityuploadd-ios.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "securityuploadd-ios.plist"; sourceTree = "<group>"; };
                6C1520CD1DCCF57A00C85C6D /* secd.8 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = secd.8; sourceTree = "<group>"; };
+               6C1A29FC1F882788002312D8 /* SFAnalyticsTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFAnalyticsTests.m; sourceTree = "<group>"; };
                6C34462F1E24F6BE00F9522B /* CKKSRateLimiterTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSRateLimiterTests.m; sourceTree = "<group>"; };
                6C34464F1E2534E800F9522B /* AWDKeychainCKKSRateLimiterAggregatedScores.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AWDKeychainCKKSRateLimiterAggregatedScores.h; path = analytics/awd/AWDKeychainCKKSRateLimiterAggregatedScores.h; sourceTree = "<group>"; };
                6C3446501E2534E800F9522B /* AWDKeychainCKKSRateLimiterAggregatedScores.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AWDKeychainCKKSRateLimiterAggregatedScores.m; path = analytics/awd/AWDKeychainCKKSRateLimiterAggregatedScores.m; sourceTree = "<group>"; };
                6C3446541E2534E800F9522B /* AWDKeychainCKKSRateLimiterTopWriters.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AWDKeychainCKKSRateLimiterTopWriters.m; path = analytics/awd/AWDKeychainCKKSRateLimiterTopWriters.m; sourceTree = "<group>"; };
                6C3446551E2534E800F9522B /* AwdMetadata-0x60-Keychain.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = "AwdMetadata-0x60-Keychain.bin"; path = "analytics/awd/AwdMetadata-0x60-Keychain.bin"; sourceTree = "<group>"; };
                6C3446561E2534E800F9522B /* AWDMetricIds_Keychain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AWDMetricIds_Keychain.h; path = analytics/awd/AWDMetricIds_Keychain.h; sourceTree = "<group>"; };
+               6C4605B81F882B9B001421B6 /* KeychainAnalyticsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KeychainAnalyticsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
                6C5232D41E3C183F00330DB1 /* CloudKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CloudKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks/CloudKit.framework; sourceTree = DEVELOPER_DIR; };
                6C588D791EAA149F00D7E322 /* RateLimiterTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RateLimiterTests.m; sourceTree = "<group>"; };
+               6C5B101B1F91613E009B091E /* supdctl-Entitlements.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "supdctl-Entitlements.plist"; sourceTree = "<group>"; };
+               6C5B10211F9164F5009B091E /* securityuploadd.8 */ = {isa = PBXFileReference; lastKnownFileType = text; path = securityuploadd.8; sourceTree = "<group>"; };
+               6C69517C1F758E1000F68F91 /* supdProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = supdProtocol.h; sourceTree = "<group>"; };
+               6C69517D1F758E1000F68F91 /* supd.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = supd.h; sourceTree = "<group>"; };
+               6C69517E1F758E1000F68F91 /* supd.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = supd.m; sourceTree = "<group>"; };
+               6C6951801F758E1000F68F91 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+               6C6951821F758E1000F68F91 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+               6C69518D1F75A7DB00F68F91 /* SFAnalyticsSQLiteStore.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFAnalyticsSQLiteStore.m; sourceTree = "<group>"; };
+               6C69518E1F75A7DC00F68F91 /* SFAnalyticsSQLiteStore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFAnalyticsSQLiteStore.h; sourceTree = "<group>"; };
+               6C69518F1F75A8C100F68F91 /* SFAnalyticsDefines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFAnalyticsDefines.h; sourceTree = "<group>"; };
+               6C758CB01F8826100075BD78 /* SupdTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SupdTests.m; sourceTree = "<group>"; };
+               6C758CB21F8826100075BD78 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+               6C7BB0032006B4EE004D1B6B /* SOSAnalytics.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SOSAnalytics.m; path = Analytics/Clients/SOSAnalytics.m; sourceTree = SOURCE_ROOT; };
+               6C7BB0042006B4EF004D1B6B /* SOSAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SOSAnalytics.h; path = Analytics/Clients/SOSAnalytics.h; sourceTree = SOURCE_ROOT; };
                6C860C741F4F63AD004100A1 /* SOSEnsureBackup.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSEnsureBackup.h; sourceTree = "<group>"; };
                6C860C7A1F4F63DB004100A1 /* SOSEnsureBackup.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SOSEnsureBackup.m; sourceTree = "<group>"; };
                6C869A771F54C2D700957298 /* AWDKeychainSOSKeychainBackupFailed.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AWDKeychainSOSKeychainBackupFailed.m; path = analytics/awd/AWDKeychainSOSKeychainBackupFailed.m; sourceTree = "<group>"; };
                6C869A781F54C2D700957298 /* AWDKeychainSOSKeychainBackupFailed.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AWDKeychainSOSKeychainBackupFailed.h; path = analytics/awd/AWDKeychainSOSKeychainBackupFailed.h; sourceTree = "<group>"; };
+               6C8CE6BB1FA248B50032ADF0 /* SFAnalyticsActivityTracker+Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SFAnalyticsActivityTracker+Internal.h"; sourceTree = "<group>"; };
+               6C8CE6C31FA24A670032ADF0 /* SFAnalyticsSampler+Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SFAnalyticsSampler+Internal.h"; sourceTree = "<group>"; };
                6C9808611E788AEB00E70590 /* CKKSCloudKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CKKSCloudKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
                6C98089D1E788AFD00E70590 /* CKKSCloudKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CKKSCloudKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+               6C9AA79E1F7C1D8F00D08296 /* supdctl */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = supdctl; sourceTree = BUILT_PRODUCTS_DIR; };
+               6C9AA7A01F7C1D9000D08296 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
                6CA2B9431E9F9F5700C43444 /* RateLimiter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RateLimiter.h; sourceTree = "<group>"; };
+               6CAA8D201F842FB3007B6E03 /* securityuploadd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = securityuploadd; sourceTree = BUILT_PRODUCTS_DIR; };
                6CB5F4751E4025AB00DBF3F0 /* CKKSCloudKitTestsInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = CKKSCloudKitTestsInfo.plist; sourceTree = "<group>"; };
                6CB5F4781E402E5700DBF3F0 /* KeychainCKKS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = KeychainCKKS.plist; path = testrunner/KeychainCKKS.plist; sourceTree = "<group>"; };
                6CB5F4791E402E5700DBF3F0 /* KeychainEntitledTestRunner-Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "KeychainEntitledTestRunner-Entitlements.plist"; sourceTree = "<group>"; };
                6CB5F47A1E402E5700DBF3F0 /* KeychainEntitledTestRunner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KeychainEntitledTestRunner.m; sourceTree = "<group>"; };
+               6CB96BB41F966E0C00E11457 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
+               6CBF65371FA147E500A68667 /* SFAnalyticsActivityTracker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFAnalyticsActivityTracker.h; sourceTree = "<group>"; };
+               6CBF65381FA147E500A68667 /* SFAnalyticsActivityTracker.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFAnalyticsActivityTracker.m; sourceTree = "<group>"; };
                6CC185971E24E87D009657D8 /* CKKSRateLimiter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSRateLimiter.h; sourceTree = "<group>"; };
                6CC185981E24E87D009657D8 /* CKKSRateLimiter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSRateLimiter.m; sourceTree = "<group>"; };
                6CC7F5B31E9F99EE0014AE63 /* RateLimiter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RateLimiter.m; sourceTree = "<group>"; };
+               6CC952421FB4C5CA0051A823 /* SFAnalytics+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SFAnalytics+Internal.h"; sourceTree = "<group>"; };
                6CCDF7841E3C25FA003F2555 /* KeychainEntitledTestRunner */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = KeychainEntitledTestRunner; sourceTree = BUILT_PRODUCTS_DIR; };
                6CCDF78B1E3C26BC003F2555 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/MacOSX.platform/Developer/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
                6CCDF7911E3C2D69003F2555 /* CKKSCloudKitTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSCloudKitTests.m; sourceTree = "<group>"; };
                6CD8D3B11EB22114009AC7DC /* AWDKeychainSecDbMarkedCorrupt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AWDKeychainSecDbMarkedCorrupt.h; path = analytics/awd/AWDKeychainSecDbMarkedCorrupt.h; sourceTree = "<group>"; };
                6CD8D3B21EB22114009AC7DC /* AWDKeychainSecDbMarkedCorrupt.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AWDKeychainSecDbMarkedCorrupt.m; path = analytics/awd/AWDKeychainSecDbMarkedCorrupt.m; sourceTree = "<group>"; };
+               6CDB5FED1FA78CB400410924 /* SFAnalyticsMultiSampler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SFAnalyticsMultiSampler.m; sourceTree = "<group>"; };
+               6CDB5FF31FA78CB500410924 /* SFAnalyticsMultiSampler+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SFAnalyticsMultiSampler+Internal.h"; sourceTree = "<group>"; };
+               6CDB5FF41FA78CB500410924 /* SFAnalyticsMultiSampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SFAnalyticsMultiSampler.h; sourceTree = "<group>"; };
+               6CDB600E1FA92C1700410924 /* securityuploadd-Entitlements.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "securityuploadd-Entitlements.plist"; sourceTree = "<group>"; };
+               6CDF8DE51F95562B00140B54 /* SFAnalyticsSampler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFAnalyticsSampler.h; sourceTree = "<group>"; };
+               6CDF8DE61F95562B00140B54 /* SFAnalyticsSampler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFAnalyticsSampler.m; sourceTree = "<group>"; };
                6CE22D6F1E49206600974785 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.0.Internal.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
                6CF4A0B41E45488B00ECD7B5 /* KeychainEntitledTestApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = KeychainEntitledTestApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
                6CF4A0B61E45488B00ECD7B5 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
                6CF4A0EE1E4549F300ECD7B5 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
                6CF4A0F11E4549F300ECD7B5 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
                6CF4A0F31E4549F300ECD7B5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+               6CFDC4561F907E1D00646DBB /* libprequelite.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libprequelite.tbd; path = usr/lib/libprequelite.tbd; sourceTree = SDKROOT; };
                7221843E1EC6782A004C7BED /* sec_action.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sec_action.c; path = src/sec_action.c; sourceTree = "<group>"; };
                7221843F1EC6782A004C7BED /* sec_action.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sec_action.h; path = src/sec_action.h; sourceTree = "<group>"; };
                7273402816CAFB3C0096622A /* MobileAsset.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileAsset.framework; path = System/Library/PrivateFrameworks/MobileAsset.framework; sourceTree = SDKROOT; };
                7281E0861DFD015A0021E1B7 /* SOSAccountGetSet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SOSAccountGetSet.m; sourceTree = "<group>"; };
                7281E08B1DFD0A380021E1B7 /* secd-80-views-alwayson.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-80-views-alwayson.m"; sourceTree = "<group>"; };
                7281E08E1DFD0D810021E1B7 /* secd-210-keyinterest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-210-keyinterest.m"; sourceTree = "<group>"; };
-               728B56A116D59979008FA3AB /* OTAPKIAssetTool */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = OTAPKIAssetTool; sourceTree = BUILT_PRODUCTS_DIR; };
                72B368BD179891FC004C37CE /* AggregateDictionary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AggregateDictionary.framework; path = System/Library/PrivateFrameworks/AggregateDictionary.framework; sourceTree = SDKROOT; };
                72C3EC2D1705F24E0040C87C /* ManagedConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ManagedConfiguration.framework; path = System/Library/PrivateFrameworks/ManagedConfiguration.framework; sourceTree = SDKROOT; };
-               72CD2BBB16D59AE30064EEE1 /* OTAServiceApp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTAServiceApp.m; sourceTree = "<group>"; };
-               72CD2BBC16D59AE30064EEE1 /* OTAServiceApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTAServiceApp.h; sourceTree = "<group>"; };
-               72CD2BBD16D59AE30064EEE1 /* OTAServicemain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTAServicemain.m; sourceTree = "<group>"; };
+               72D1E5F3202FE43C003A38C5 /* secdmock_db_version_10_5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = secdmock_db_version_10_5.h; sourceTree = "<group>"; };
                78F92F10195128D70023B54B /* SecECKeyPriv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecECKeyPriv.h; sourceTree = "<group>"; };
                7901790E12D51F7200CA4D44 /* SecCmsBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCmsBase.h; sourceTree = "<group>"; };
                7901790F12D51F7200CA4D44 /* SecCmsContentInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCmsContentInfo.h; sourceTree = "<group>"; };
                BE22FBD01EE2084100893431 /* Config.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Config.m; path = manifeststresstest/Config.m; sourceTree = "<group>"; };
                BE22FBFC1EE23D9100893431 /* mark.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = mark.m; path = manifeststresstest/mark.m; sourceTree = "<group>"; };
                BE22FC031EE23DA600893431 /* mark.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mark.h; path = manifeststresstest/mark.h; sourceTree = "<group>"; };
+               BE2AD2B11FDA07EF00739F96 /* OTBottledPeerRecord.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OTBottledPeerRecord.h; path = ot/OTBottledPeerRecord.h; sourceTree = "<group>"; };
+               BE2AD2B21FDA07EF00739F96 /* OTBottledPeerRecord.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OTBottledPeerRecord.m; path = ot/OTBottledPeerRecord.m; sourceTree = "<group>"; };
+               BE3405A11FD71CC800933DAC /* OTBottle.proto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = OTBottle.proto; sourceTree = "<group>"; };
+               BE3405A31FD71DA400933DAC /* OTBottle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTBottle.m; sourceTree = "<group>"; };
+               BE3405A41FD71DA600933DAC /* OTBottle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTBottle.h; sourceTree = "<group>"; };
+               BE3405A51FD720C900933DAC /* OTBottleContents.proto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = OTBottleContents.proto; sourceTree = "<group>"; };
+               BE3405A61FD7210200933DAC /* OTBottleContents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTBottleContents.h; sourceTree = "<group>"; };
+               BE3405A71FD7210300933DAC /* OTBottleContents.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTBottleContents.m; sourceTree = "<group>"; };
                BE442BC118B7FDB800F24DAE /* swcagent */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = swcagent; sourceTree = BUILT_PRODUCTS_DIR; };
                BE4AC9A118B7FFAD00B84964 /* swcagent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = swcagent.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
                BE4AC9AD18B7FFC800B84964 /* com.apple.security.swcagent.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = com.apple.security.swcagent.plist; sourceTree = "<group>"; };
                BE6215BD1DB6E69100961E15 /* si-84-sectrust-allowlist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "si-84-sectrust-allowlist.m"; sourceTree = "<group>"; };
                BE8351D41EC0EEDD00ACD5FD /* framework_requiring_modern_objc_runtime.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = framework_requiring_modern_objc_runtime.xcconfig; path = xcconfig/framework_requiring_modern_objc_runtime.xcconfig; sourceTree = "<group>"; };
                BE8ABDD71DC2DD9100EC2D58 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
+               BEB0B0CE1FFC37E3007E6A83 /* OTPrivateKey.proto */ = {isa = PBXFileReference; lastKnownFileType = text; path = OTPrivateKey.proto; sourceTree = "<group>"; };
+               BEB0B0D41FFC3D32007E6A83 /* OTPrivateKey.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTPrivateKey.m; sourceTree = "<group>"; };
+               BEB0B0D51FFC3D33007E6A83 /* OTPrivateKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTPrivateKey.h; sourceTree = "<group>"; };
+               BEB0B0D91FFC45C2007E6A83 /* OTPrivateKey+SF.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "OTPrivateKey+SF.h"; path = "ot/OTPrivateKey+SF.h"; sourceTree = "<group>"; };
+               BEB0B0DA1FFC45C2007E6A83 /* OTPrivateKey+SF.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "OTPrivateKey+SF.m"; path = "ot/OTPrivateKey+SF.m"; sourceTree = "<group>"; };
+               BEB9E9E51FFF193D00676593 /* si-88-sectrust-valid.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "si-88-sectrust-valid.m"; path = "OSX/shared_regressions/si-88-sectrust-valid.m"; sourceTree = SOURCE_ROOT; };
+               BEB9EA2E1FFF1AF600676593 /* si-88-sectrust-valid-data */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "si-88-sectrust-valid-data"; sourceTree = "<group>"; };
                BED208DD1EDF950E00753952 /* manifeststresstest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = manifeststresstest; sourceTree = BUILT_PRODUCTS_DIR; };
                BED208E61EDF971600753952 /* manifeststresstest.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; name = manifeststresstest.entitlements; path = manifeststresstest/manifeststresstest.entitlements; sourceTree = "<group>"; };
                BED208E71EDF971600753952 /* manifeststresstest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = manifeststresstest.m; path = manifeststresstest/manifeststresstest.m; sourceTree = "<group>"; };
+               BEE4B1861FFD57D800777D39 /* OTAuthenticatedCiphertext.proto */ = {isa = PBXFileReference; lastKnownFileType = text; path = OTAuthenticatedCiphertext.proto; sourceTree = "<group>"; };
+               BEE4B18E1FFD5F9000777D39 /* OTAuthenticatedCiphertext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTAuthenticatedCiphertext.h; sourceTree = "<group>"; };
+               BEE4B18F1FFD5F9100777D39 /* OTAuthenticatedCiphertext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTAuthenticatedCiphertext.m; sourceTree = "<group>"; };
+               BEE4B1901FFD604B00777D39 /* OTAuthenticatedCiphertext+SF.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "OTAuthenticatedCiphertext+SF.h"; path = "ot/OTAuthenticatedCiphertext+SF.h"; sourceTree = "<group>"; };
+               BEE4B1911FFD604B00777D39 /* OTAuthenticatedCiphertext+SF.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "OTAuthenticatedCiphertext+SF.m"; path = "ot/OTAuthenticatedCiphertext+SF.m"; sourceTree = "<group>"; };
+               BEE4B1961FFDAFE600777D39 /* SFPublicKey+SPKI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SFPublicKey+SPKI.h"; path = "ot/SFPublicKey+SPKI.h"; sourceTree = "<group>"; };
+               BEE4B1971FFDAFE600777D39 /* SFECPublicKey+SPKI.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "SFECPublicKey+SPKI.m"; path = "ot/SFECPublicKey+SPKI.m"; sourceTree = "<group>"; };
                BEEB47D71EA189F5004AA5C6 /* SecTrustStatusCodes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecTrustStatusCodes.c; sourceTree = "<group>"; };
                BEEB47D81EA189F5004AA5C6 /* SecTrustStatusCodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecTrustStatusCodes.h; sourceTree = "<group>"; };
                BEF88C281EAFFC3F00357577 /* TrustedPeers.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TrustedPeers.framework; sourceTree = BUILT_PRODUCTS_DIR; };
                D40B6A871E2B5F9900CD6EE5 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks/CoreFoundation.framework; sourceTree = DEVELOPER_DIR; };
                D40B6A881E2B5F9900CD6EE5 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
                D41149A01E7C935D00C078C7 /* AppleiPhoneDeviceCACertificates.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppleiPhoneDeviceCACertificates.h; sourceTree = "<group>"; };
+               D4119E72202BDF2B0048587B /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
                D41257CF1E9410A300781F23 /* trustd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = trustd; sourceTree = BUILT_PRODUCTS_DIR; };
                D41257E91E941CF200781F23 /* com.apple.trustd.agent.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = com.apple.trustd.agent.plist; path = OSX/trustd/macOS/com.apple.trustd.agent.plist; sourceTree = "<group>"; };
                D41257EA1E941CF200781F23 /* com.apple.trustd.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = com.apple.trustd.plist; path = OSX/trustd/macOS/com.apple.trustd.plist; sourceTree = "<group>"; };
                D43DBED61E99D17100C04AEA /* asynchttp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = asynchttp.h; path = OSX/sec/securityd/asynchttp.h; sourceTree = "<group>"; };
                D43DBED71E99D17100C04AEA /* nameconstraints.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = nameconstraints.c; path = OSX/sec/securityd/nameconstraints.c; sourceTree = "<group>"; };
                D43DBED81E99D17100C04AEA /* nameconstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nameconstraints.h; path = OSX/sec/securityd/nameconstraints.h; sourceTree = "<group>"; };
-               D43DBED91E99D17100C04AEA /* OTATrustUtilities.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = OTATrustUtilities.c; path = OSX/sec/securityd/OTATrustUtilities.c; sourceTree = "<group>"; };
+               D43DBED91E99D17100C04AEA /* OTATrustUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OTATrustUtilities.m; path = OSX/sec/securityd/OTATrustUtilities.m; sourceTree = "<group>"; };
                D43DBEDA1E99D17100C04AEA /* OTATrustUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OTATrustUtilities.h; path = OSX/sec/securityd/OTATrustUtilities.h; sourceTree = "<group>"; };
                D43DBEDB1E99D17100C04AEA /* personalization.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = personalization.c; path = OSX/sec/securityd/personalization.c; sourceTree = "<group>"; };
                D43DBEDC1E99D17100C04AEA /* personalization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = personalization.h; path = OSX/sec/securityd/personalization.h; sourceTree = "<group>"; };
                D43DBEF21E99D17300C04AEA /* SecRevocationDb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecRevocationDb.h; path = OSX/sec/securityd/SecRevocationDb.h; sourceTree = "<group>"; };
                D43DBEF31E99D17300C04AEA /* SecRevocationServer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecRevocationServer.c; path = OSX/sec/securityd/SecRevocationServer.c; sourceTree = "<group>"; };
                D43DBEF41E99D17300C04AEA /* SecRevocationServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecRevocationServer.h; path = OSX/sec/securityd/SecRevocationServer.h; sourceTree = "<group>"; };
-               D43DBEF51E99D17300C04AEA /* SecTrustLoggingServer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecTrustLoggingServer.c; path = OSX/sec/securityd/SecTrustLoggingServer.c; sourceTree = "<group>"; };
+               D43DBEF51E99D17300C04AEA /* SecTrustLoggingServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SecTrustLoggingServer.m; path = OSX/sec/securityd/SecTrustLoggingServer.m; sourceTree = "<group>"; };
                D43DBEF61E99D17300C04AEA /* SecTrustLoggingServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecTrustLoggingServer.h; path = OSX/sec/securityd/SecTrustLoggingServer.h; sourceTree = "<group>"; };
                D43DBEF71E99D17300C04AEA /* SecTrustServer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecTrustServer.c; path = OSX/sec/securityd/SecTrustServer.c; sourceTree = "<group>"; };
                D43DBEF81E99D17300C04AEA /* SecTrustServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecTrustServer.h; path = OSX/sec/securityd/SecTrustServer.h; sourceTree = "<group>"; };
                D43DBEF91E99D17300C04AEA /* SecTrustStoreServer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecTrustStoreServer.c; path = OSX/sec/securityd/SecTrustStoreServer.c; sourceTree = "<group>"; };
                D43DBEFA1E99D17300C04AEA /* SecTrustStoreServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecTrustStoreServer.h; path = OSX/sec/securityd/SecTrustStoreServer.h; sourceTree = "<group>"; };
+               D43DDE511F620F09009742A5 /* SecPolicyChecks.list */ = {isa = PBXFileReference; lastKnownFileType = text; path = SecPolicyChecks.list; sourceTree = "<group>"; };
+               D43DDE581F638061009742A5 /* SecPolicy.list */ = {isa = PBXFileReference; lastKnownFileType = text; path = SecPolicy.list; sourceTree = "<group>"; };
                D45068681E948A9E00FA7675 /* entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = entitlements.plist; path = OSX/trustd/macOS/entitlements.plist; sourceTree = "<group>"; };
                D45068691E948ACE00FA7675 /* entitlements.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = entitlements.plist; path = OSX/trustd/iOS/entitlements.plist; sourceTree = "<group>"; };
+               D453C38A1FEC669300DE349B /* trust_update.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = trust_update.m; sourceTree = "<group>"; };
+               D453C47F1FFD857400DE349B /* security_tool_commands.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = security_tool_commands.h; path = OSX/utilities/SecurityTool/security_tool_commands.h; sourceTree = SOURCE_ROOT; };
+               D46246911F9AE2E400D63882 /* libDER.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libDER.a; path = usr/local/lib/security_libDER/libDER.a; sourceTree = SDKROOT; };
+               D462469C1F9AE45900D63882 /* oids.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = oids.c; sourceTree = "<group>"; };
+               D46246A21F9AE49E00D63882 /* oids.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = oids.h; path = trust/oids.h; sourceTree = "<group>"; };
+               D46246A91F9AE6C900D63882 /* libDER.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libDER.a; path = usr/local/lib/security_libDER/libDER.a; sourceTree = SDKROOT; };
+               D46246AF1F9AE73F00D63882 /* libDER.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libDER.a; path = usr/local/lib/security_libDER/libDER.a; sourceTree = SDKROOT; };
+               D46246C31F9AEA5200D63882 /* libDER.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libDER.a; path = usr/local/lib/security_libDER/libDER.a; sourceTree = SDKROOT; };
+               D46246CE1F9AEAE300D63882 /* libDER.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libDER.a; path = usr/local/lib/security_libDER/libDER.a; sourceTree = SDKROOT; };
+               D479F6E01F980F8F00388D28 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Trust.strings; sourceTree = "<group>"; };
                D47C56AB1DCA831C00E18518 /* lib_ios_x64.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = lib_ios_x64.xcconfig; path = xcconfig/lib_ios_x64.xcconfig; sourceTree = "<group>"; };
                D47C56AF1DCA841D00E18518 /* lib_ios_x64_shim.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = lib_ios_x64_shim.xcconfig; path = xcconfig/lib_ios_x64_shim.xcconfig; sourceTree = "<group>"; };
                D47C56FB1DCA8F4900E18518 /* all_arches.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = all_arches.xcconfig; path = xcconfig/all_arches.xcconfig; sourceTree = "<group>"; };
                D4ADA3191E2B41670031CEA3 /* libtrustd.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libtrustd.a; sourceTree = BUILT_PRODUCTS_DIR; };
                D4B858661D370D9A003B2D95 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.Internal.sdk/System/Library/Frameworks/MobileCoreServices.framework; sourceTree = DEVELOPER_DIR; };
                D4BEECE61E93093A00F76D1A /* trustd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = trustd.c; path = OSX/trustd/trustd.c; sourceTree = "<group>"; };
+               D4C263C51F8FF2A9001317EA /* generateErrStrings.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; name = generateErrStrings.pl; path = OSX/lib/generateErrStrings.pl; sourceTree = "<group>"; usesTabs = 1; };
+               D4C263C81F952E64001317EA /* SecDebugErrorMessages.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = SecDebugErrorMessages.strings; path = derived_src/SecDebugErrorMessages.strings; sourceTree = BUILT_PRODUCTS_DIR; };
+               D4C263CD1F952F6C001317EA /* SecErrorMessages.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = SecErrorMessages.strings; path = derived_src/English.lproj/SecErrorMessages.strings; sourceTree = BUILT_PRODUCTS_DIR; };
+               D4C6C5C71FB2AD3F007EA57E /* si-87-sectrust-name-constraints */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "si-87-sectrust-name-constraints"; sourceTree = "<group>"; };
+               D4C6C5CB1FB3B3CC007EA57E /* libarchive.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libarchive.tbd; path = usr/lib/libarchive.tbd; sourceTree = SDKROOT; };
+               D4C6C5CE1FB3B44C007EA57E /* libarchive.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libarchive.2.dylib; path = /usr/lib/libarchive.2.dylib; sourceTree = SDKROOT; };
                D4C8A1511E66709800CD6DF1 /* si-32-sectrust-pinning-required.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "si-32-sectrust-pinning-required.h"; sourceTree = "<group>"; };
                D4CFAA7D1E660BB3004746AA /* si-32-sectrust-pinning-required.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "si-32-sectrust-pinning-required.m"; sourceTree = "<group>"; };
                D4D718341E04A721000AE7A6 /* spbkdf-01-hmac-sha256.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "spbkdf-01-hmac-sha256.c"; sourceTree = "<group>"; };
                DA30D6781DF8C8FB00EC6B43 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                DA30D6831DF8CA4100EC6B43 /* KeychainSyncAccountUpdater.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeychainSyncAccountUpdater.h; sourceTree = "<group>"; };
                DA30D6841DF8CA4100EC6B43 /* KeychainSyncAccountUpdater.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KeychainSyncAccountUpdater.m; sourceTree = "<group>"; };
+               DA6AA15E1FE88AF9004565B0 /* CKKSControlServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSControlServer.m; sourceTree = "<group>"; };
+               DA6AA1641FE88AFA004565B0 /* CKKSControlServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSControlServer.h; sourceTree = "<group>"; };
+               DAB27ADA1FA29EB700DEBBDE /* SOSControlServer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSControlServer.h; sourceTree = "<group>"; };
+               DAB27AE01FA29EB800DEBBDE /* SOSControlServer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SOSControlServer.m; sourceTree = "<group>"; };
+               DAEE05551FAD3FC500DF27F3 /* AutoreleaseTest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = AutoreleaseTest.c; sourceTree = "<group>"; };
+               DAEE055B1FAD3FC600DF27F3 /* AutoreleaseTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutoreleaseTest.h; sourceTree = "<group>"; };
                DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = macos_legacy_lib.xcconfig; path = xcconfig/macos_legacy_lib.xcconfig; sourceTree = "<group>"; };
                DC0067C01D87876F005AF8DB /* libsecurityd_server.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsecurityd_server.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DC0067D01D878898005AF8DB /* libsecurityd_ucspc.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsecurityd_ucspc.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DC0BC6131D8B755200070CB0 /* ckutilities.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ckutilities.c; sourceTree = "<group>"; };
                DC0BC6141D8B755200070CB0 /* ckutilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ckutilities.h; sourceTree = "<group>"; };
                DC0BC6151D8B755200070CB0 /* Crypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Crypt.h; sourceTree = "<group>"; };
-               DC0BC6161D8B755200070CB0 /* CryptKitSA.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptKitSA.h; sourceTree = "<group>"; };
-               DC0BC6171D8B755200070CB0 /* CryptKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptKit.h; sourceTree = "<group>"; };
                DC0BC6181D8B755200070CB0 /* CryptKitAsn1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptKitAsn1.cpp; sourceTree = "<group>"; };
                DC0BC6191D8B755200070CB0 /* CryptKitAsn1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptKitAsn1.h; sourceTree = "<group>"; };
                DC0BC61A1D8B755200070CB0 /* CryptKitDER.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptKitDER.cpp; sourceTree = "<group>"; };
                DC0BCD551D8C697100070CB0 /* su-40-secdb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "su-40-secdb.c"; sourceTree = "<group>"; };
                DC0BCD561D8C697100070CB0 /* su-41-secdb-stress.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "su-41-secdb-stress.c"; sourceTree = "<group>"; };
                DC0BCDB41D8C6A5B00070CB0 /* not_on_this_platorm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = not_on_this_platorm.c; sourceTree = "<group>"; };
+               DC124DC120059B8700BE8DAC /* OctagonControlServer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OctagonControlServer.h; path = ot/OctagonControlServer.h; sourceTree = "<group>"; };
+               DC124DC220059B8700BE8DAC /* OctagonControlServer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OctagonControlServer.m; path = ot/OctagonControlServer.m; sourceTree = "<group>"; };
+               DC1447881F5764C600236DB4 /* CKKSResultOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSResultOperation.h; sourceTree = "<group>"; };
+               DC1447891F5764C600236DB4 /* CKKSResultOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSResultOperation.m; sourceTree = "<group>"; };
+               DC1447941F5766D200236DB4 /* NSOperationCategories.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NSOperationCategories.h; sourceTree = "<group>"; };
+               DC1447951F5766D200236DB4 /* NSOperationCategories.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NSOperationCategories.m; sourceTree = "<group>"; };
                DC15F7641E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSHealKeyHierarchyOperation.h; sourceTree = "<group>"; };
                DC15F7651E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSHealKeyHierarchyOperation.m; sourceTree = "<group>"; };
                DC15F79B1E68EAD5003B9A40 /* CKKSTests+API.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CKKSTests+API.m"; sourceTree = "<group>"; };
                DC1784421D77869A00B50D50 /* libsecurity_smime.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libsecurity_smime.xcodeproj; path = OSX/libsecurity_smime/libsecurity_smime.xcodeproj; sourceTree = "<group>"; };
                DC1784AE1D7786C700B50D50 /* libsecurity_cms.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libsecurity_cms.xcodeproj; path = OSX/libsecurity_cms/libsecurity_cms.xcodeproj; sourceTree = "<group>"; };
-               DC1785051D77873100B50D50 /* Security.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Security.framework; sourceTree = BUILT_PRODUCTS_DIR; };
                DC1785111D77895A00B50D50 /* oidsalg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = oidsalg.h; path = OSX/libsecurity_asn1/lib/oidsalg.h; sourceTree = "<group>"; };
                DC1785121D77895A00B50D50 /* oidsattr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = oidsattr.h; path = OSX/libsecurity_asn1/lib/oidsattr.h; sourceTree = "<group>"; };
                DC1785131D77895A00B50D50 /* SecAsn1Coder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecAsn1Coder.h; path = OSX/libsecurity_asn1/lib/SecAsn1Coder.h; sourceTree = "<group>"; };
                DC17853A1D778A3100B50D50 /* mds_schema.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mds_schema.h; path = OSX/libsecurity_mds/lib/mds_schema.h; sourceTree = "<group>"; };
                DC17853B1D778A3100B50D50 /* mds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mds.h; path = OSX/libsecurity_mds/lib/mds.h; sourceTree = "<group>"; };
                DC17853F1D778A4E00B50D50 /* SecureDownload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecureDownload.h; path = OSX/libsecurity_manifest/lib/SecureDownload.h; sourceTree = "<group>"; };
-               DC1785421D778A7400B50D50 /* oids.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = oids.h; sourceTree = "<group>"; };
                DC1785451D778ACD00B50D50 /* SecAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecAccess.h; path = OSX/libsecurity_keychain/lib/SecAccess.h; sourceTree = "<group>"; };
                DC1785461D778ACD00B50D50 /* SecACL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecACL.h; path = OSX/libsecurity_keychain/lib/SecACL.h; sourceTree = "<group>"; };
                DC1785471D778ACD00B50D50 /* SecCertificateOIDs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCertificateOIDs.h; path = OSX/libsecurity_keychain/lib/SecCertificateOIDs.h; sourceTree = "<group>"; };
                DC1785811D778B7F00B50D50 /* CodeSigning.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CodeSigning.h; path = lib/CodeSigning.h; sourceTree = "<group>"; };
                DC1785821D778B7F00B50D50 /* CSCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSCommon.h; path = lib/CSCommon.h; sourceTree = "<group>"; };
                DC1785831D778B7F00B50D50 /* SecCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCode.h; path = lib/SecCode.h; sourceTree = "<group>"; };
-               DC1785841D778B8000B50D50 /* SecCodeHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCodeHost.h; path = lib/SecCodeHost.h; sourceTree = "<group>"; };
                DC1785851D778B8000B50D50 /* SecRequirement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecRequirement.h; path = lib/SecRequirement.h; sourceTree = "<group>"; };
                DC1785861D778B8000B50D50 /* SecStaticCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecStaticCode.h; path = lib/SecStaticCode.h; sourceTree = "<group>"; };
                DC17858E1D778B9D00B50D50 /* CMSDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CMSDecoder.h; path = OSX/libsecurity_cms/lib/CMSDecoder.h; sourceTree = "<group>"; };
                DC1787421D77906C00B50D50 /* cssmapplePriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cssmapplePriv.h; path = OSX/libsecurity_cssm/lib/cssmapplePriv.h; sourceTree = "<group>"; };
                DC1787441D7790A500B50D50 /* CSCommonPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSCommonPriv.h; path = lib/CSCommonPriv.h; sourceTree = "<group>"; };
                DC1787451D7790A500B50D50 /* SecAssessment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecAssessment.h; path = lib/SecAssessment.h; sourceTree = "<group>"; };
-               DC1787461D7790A500B50D50 /* SecCodeHostLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCodeHostLib.h; path = lib/SecCodeHostLib.h; sourceTree = "<group>"; };
                DC1787471D7790A500B50D50 /* SecCodePriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCodePriv.h; path = lib/SecCodePriv.h; sourceTree = "<group>"; };
                DC1787481D7790A500B50D50 /* SecCodeSigner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCodeSigner.h; path = lib/SecCodeSigner.h; sourceTree = "<group>"; };
                DC17874B1D7790A500B50D50 /* SecRequirementPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecRequirementPriv.h; path = lib/SecRequirementPriv.h; sourceTree = "<group>"; };
                DC378B371DEFADB500A3DAFA /* CKKSZoneStateEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSZoneStateEntry.m; sourceTree = "<group>"; };
                DC378B3A1DF0CA7200A3DAFA /* CKKSIncomingQueueEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSIncomingQueueEntry.h; sourceTree = "<group>"; };
                DC378B3B1DF0CA7200A3DAFA /* CKKSIncomingQueueEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSIncomingQueueEntry.m; sourceTree = "<group>"; };
-               DC3832C01DB6E69800385F63 /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
                DC3A4B581D91E9FB00E46D4A /* com.apple.CodeSigningHelper.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.CodeSigningHelper.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
                DC3A4B5F1D91EAC500E46D4A /* CodeSigningHelper-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "CodeSigningHelper-Info.plist"; sourceTree = "<group>"; };
                DC3A4B601D91EAC500E46D4A /* com.apple.CodeSigningHelper.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.apple.CodeSigningHelper.sb; sourceTree = "<group>"; };
                DC3A4B621D91EAC500E46D4A /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
                DC3A81D41D99D567000C7419 /* libcoretls_cfhelpers.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcoretls_cfhelpers.dylib; path = usr/lib/libcoretls_cfhelpers.dylib; sourceTree = SDKROOT; };
+               DC3D748A1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSLocalSynchronizeOperation.h; sourceTree = "<group>"; };
+               DC3D748B1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSLocalSynchronizeOperation.m; sourceTree = "<group>"; };
                DC4269031E82EDAC002B7110 /* SecItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecItem.m; sourceTree = "<group>"; };
                DC4269061E82FBDF002B7110 /* server_security_helpers.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = server_security_helpers.c; sourceTree = "<group>"; };
                DC4269071E82FBDF002B7110 /* server_security_helpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = server_security_helpers.h; sourceTree = "<group>"; };
+               DC4D49D81F857728007AF2B8 /* CKKSSerializedKey.proto */ = {isa = PBXFileReference; lastKnownFileType = text; path = CKKSSerializedKey.proto; sourceTree = "<group>"; };
                DC4DB14E1E24692100CD6769 /* CKKSKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSKey.h; sourceTree = "<group>"; };
                DC4DB14F1E24692100CD6769 /* CKKSKey.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSKey.m; sourceTree = "<group>"; };
-               DC4DB15E1E2590B100CD6769 /* CKKSEncryptionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSEncryptionTests.m; sourceTree = "<group>"; };
+               DC4DB15E1E2590B100CD6769 /* CKKSAESSIVEncryptionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSAESSIVEncryptionTests.m; sourceTree = "<group>"; };
                DC5225091E402D8B0021640A /* PlatformLibraries.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = PlatformLibraries.xcconfig; path = xcconfig/PlatformLibraries.xcconfig; sourceTree = "<group>"; };
                DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libsecurityd_ios.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libSecureObjectSyncServer.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DC58C43B1D77BED0003C25A4 /* csparser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = csparser.cpp; path = OSX/lib/plugins/csparser.cpp; sourceTree = "<group>"; };
                DC58C43C1D77BED0003C25A4 /* csparser.exp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.exports; name = csparser.exp; path = OSX/lib/plugins/csparser.exp; sourceTree = "<group>"; };
                DC58C4411D77BFA4003C25A4 /* security_macos.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = security_macos.xcconfig; path = OSX/config/security_macos.xcconfig; sourceTree = "<group>"; };
-               DC59E9EC1D91C9DC001BDDF5 /* libDER_not_installed.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libDER_not_installed.a; sourceTree = BUILT_PRODUCTS_DIR; };
-               DC59E9ED1D91CA0A001BDDF5 /* DER_Keys.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = DER_Keys.c; sourceTree = "<group>"; };
-               DC59E9EE1D91CA0A001BDDF5 /* DER_Keys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DER_Keys.h; sourceTree = "<group>"; };
-               DC59E9EF1D91CA0A001BDDF5 /* asn1Types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = asn1Types.h; sourceTree = "<group>"; };
-               DC59E9F01D91CA0A001BDDF5 /* DER_CertCrl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = DER_CertCrl.c; sourceTree = "<group>"; };
-               DC59E9F11D91CA0A001BDDF5 /* DER_CertCrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DER_CertCrl.h; sourceTree = "<group>"; };
-               DC59E9F21D91CA0A001BDDF5 /* DER_Decode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = DER_Decode.c; sourceTree = "<group>"; };
-               DC59E9F31D91CA0A001BDDF5 /* DER_Decode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DER_Decode.h; sourceTree = "<group>"; };
-               DC59E9F41D91CA0A001BDDF5 /* DER_Encode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = DER_Encode.c; sourceTree = "<group>"; };
-               DC59E9F51D91CA0A001BDDF5 /* DER_Encode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DER_Encode.h; sourceTree = "<group>"; };
-               DC59E9F61D91CA0A001BDDF5 /* libDER_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libDER_config.h; sourceTree = "<group>"; };
-               DC59E9F71D91CA0A001BDDF5 /* libDER.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libDER.h; sourceTree = "<group>"; };
-               DC59E9F81D91CA0A001BDDF5 /* DER_Digest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DER_Digest.h; sourceTree = "<group>"; };
-               DC59E9F91D91CA0A001BDDF5 /* DER_Digest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = DER_Digest.c; sourceTree = "<group>"; };
-               DC59E9FA1D91CA0A001BDDF5 /* oids.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = oids.c; sourceTree = "<group>"; };
-               DC59E9FC1D91CA0A001BDDF5 /* oidsPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = oidsPriv.h; sourceTree = "<group>"; };
-               DC59EA251D91CA15001BDDF5 /* libDERUtils.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libDERUtils.a; sourceTree = BUILT_PRODUCTS_DIR; };
-               DC59EA261D91CA2C001BDDF5 /* libDERUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libDERUtils.h; sourceTree = "<group>"; };
-               DC59EA271D91CA2C001BDDF5 /* libDERUtils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = libDERUtils.c; sourceTree = "<group>"; };
-               DC59EA281D91CA2C001BDDF5 /* fileIo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fileIo.c; sourceTree = "<group>"; };
-               DC59EA291D91CA2C001BDDF5 /* fileIo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fileIo.h; sourceTree = "<group>"; };
-               DC59EA2A1D91CA2C001BDDF5 /* printFields.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = printFields.h; sourceTree = "<group>"; };
-               DC59EA2B1D91CA2C001BDDF5 /* printFields.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = printFields.c; sourceTree = "<group>"; };
-               DC59EA371D91CA82001BDDF5 /* parseCert */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = parseCert; sourceTree = BUILT_PRODUCTS_DIR; };
-               DC59EA451D91CACE001BDDF5 /* AppleMobilePersonalizedTicket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppleMobilePersonalizedTicket.h; sourceTree = "<group>"; };
-               DC59EA461D91CACE001BDDF5 /* DER_Ticket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = DER_Ticket.c; sourceTree = "<group>"; };
-               DC59EA471D91CACE001BDDF5 /* DER_Ticket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DER_Ticket.h; sourceTree = "<group>"; };
-               DC59EA481D91CACE001BDDF5 /* parseTicket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = parseTicket.c; sourceTree = "<group>"; };
-               DC59EA491D91CACE001BDDF5 /* parseCert.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = parseCert.c; sourceTree = "<group>"; };
-               DC59EA4A1D91CACE001BDDF5 /* parseCrl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = parseCrl.c; sourceTree = "<group>"; };
-               DC59EA601D91CAF0001BDDF5 /* parseCrl */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = parseCrl; sourceTree = BUILT_PRODUCTS_DIR; };
-               DC59EA701D91CB9F001BDDF5 /* parseTicket */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = parseTicket; sourceTree = BUILT_PRODUCTS_DIR; };
                DC59EA731D91CBD0001BDDF5 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; };
                DC5ABD781D832D5800CF422C /* srCdsaUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = srCdsaUtils.cpp; sourceTree = "<group>"; };
                DC5ABD791D832D5800CF422C /* srCdsaUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = srCdsaUtils.h; sourceTree = "<group>"; };
                DC6ACC401E81DF9400125DC5 /* server_endpoint.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = server_endpoint.m; sourceTree = "<group>"; };
                DC71D8DD1D94CF3C0065FB93 /* lib_ios_shim.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = lib_ios_shim.xcconfig; path = xcconfig/lib_ios_shim.xcconfig; sourceTree = "<group>"; };
                DC71D9DF1D95BA6C0065FB93 /* libASN1.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libASN1.a; sourceTree = BUILT_PRODUCTS_DIR; };
-               DC71D9FB1D95BB0A0065FB93 /* libDER.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libDER.a; sourceTree = BUILT_PRODUCTS_DIR; };
+               DC7341F11F8447AB00AB9BDF /* CKKSTLKShare.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSTLKShare.h; sourceTree = "<group>"; };
+               DC7341F21F8447AB00AB9BDF /* CKKSTLKShare.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSTLKShare.m; sourceTree = "<group>"; };
+               DC7341FD1F84642C00AB9BDF /* CKKSTLKSharingEncryptionTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSTLKSharingEncryptionTests.m; sourceTree = "<group>"; };
                DC762A9C1E57A86A00B03A2C /* CKKSRecordHolder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSRecordHolder.h; sourceTree = "<group>"; };
                DC762A9D1E57A86A00B03A2C /* CKKSRecordHolder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSRecordHolder.m; sourceTree = "<group>"; };
                DC797E131DD3F88300CC9E42 /* CKKSSQLDatabaseObject.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSSQLDatabaseObject.m; sourceTree = "<group>"; };
                DC9B7AE41DCBF604004E9385 /* CKKSOutgoingQueueEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSOutgoingQueueEntry.m; sourceTree = "<group>"; };
                DC9B7AE61DCBF651004E9385 /* CKKSOutgoingQueueEntry.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSOutgoingQueueEntry.h; sourceTree = "<group>"; };
                DC9C750F1E4BCC5100F1CA0D /* CKKSOperationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSOperationTests.m; sourceTree = "<group>"; };
+               DC9C95951F748D0B000D19E5 /* CKKSServerValidationRecoveryTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSServerValidationRecoveryTests.m; sourceTree = "<group>"; };
+               DC9C95B21F79CFD1000D19E5 /* CKKSControl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSControl.h; sourceTree = "<group>"; };
+               DC9C95B31F79CFD1000D19E5 /* CKKSControl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSControl.m; sourceTree = "<group>"; };
                DC9EBA231DEE36FE00D0F733 /* ApplePushService.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplePushService.framework; path = System/Library/PrivateFrameworks/ApplePushService.framework; sourceTree = SDKROOT; };
                DC9EBA2F1DEE651500D0F733 /* Info-macOS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-macOS.plist"; sourceTree = "<group>"; };
                DC9EBA311DEE768000D0F733 /* CloudKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CloudKit.framework; path = System/Library/Frameworks/CloudKit.framework; sourceTree = SDKROOT; };
+               DC9FD3261F858D3E00C8AAC8 /* CKKSSerializedKey.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSSerializedKey.m; sourceTree = "<group>"; };
+               DC9FD3271F858D3F00C8AAC8 /* CKKSSerializedKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSSerializedKey.h; sourceTree = "<group>"; };
+               DC9FD3281F8598F300C8AAC8 /* CKKSPeer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSPeer.h; sourceTree = "<group>"; };
+               DC9FD3291F8598F300C8AAC8 /* CKKSPeer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSPeer.m; sourceTree = "<group>"; };
                DCA4D1F31E5520550056214F /* CKKSCurrentKeyPointer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSCurrentKeyPointer.h; sourceTree = "<group>"; };
                DCA4D1F41E5520550056214F /* CKKSCurrentKeyPointer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSCurrentKeyPointer.m; sourceTree = "<group>"; };
                DCA4D2131E5684220056214F /* CKKSReencryptOutgoingItemsOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSReencryptOutgoingItemsOperation.h; sourceTree = "<group>"; };
                DCA4D2141E5684220056214F /* CKKSReencryptOutgoingItemsOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSReencryptOutgoingItemsOperation.m; sourceTree = "<group>"; };
+               DCAD9B421F8D939C00C5E2AE /* CKKSFixups.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSFixups.h; sourceTree = "<group>"; };
+               DCAD9B431F8D939C00C5E2AE /* CKKSFixups.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSFixups.m; sourceTree = "<group>"; };
+               DCAD9B481F8D95F200C5E2AE /* CloudKitKeychainSyncingFixupTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CloudKitKeychainSyncingFixupTests.m; sourceTree = "<group>"; };
                DCB2214A1E8B0861001598BC /* server_xpc.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = server_xpc.m; sourceTree = "<group>"; };
                DCB2215B1E8B098D001598BC /* server_endpoint.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = server_endpoint.h; sourceTree = "<group>"; };
+               DCB332361F467CC200178C30 /* macos_tapi_hacks.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = macos_tapi_hacks.h; path = OSX/macos_tapi_hacks.h; sourceTree = "<group>"; };
+               DCB332371F46804000178C30 /* SOSSysdiagnose.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSSysdiagnose.h; sourceTree = "<group>"; };
                DCB3406D1D8A24DF0054D16E /* libsecurity_authorization.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsecurity_authorization.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DCB3406F1D8A24F70054D16E /* Authorization.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Authorization.c; path = lib/Authorization.c; sourceTree = "<group>"; };
                DCB340761D8A24F70054D16E /* Authorization.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Authorization.cpp; path = lib/Authorization.cpp; sourceTree = "<group>"; };
                DCB342D21D8A32A20054D16E /* UnlockReferralItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnlockReferralItem.h; sourceTree = "<group>"; };
                DCB342D31D8A32A20054D16E /* TrustSettingsUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TrustSettingsUtils.cpp; sourceTree = "<group>"; };
                DCB342D41D8A32A20054D16E /* TrustSettingsUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrustSettingsUtils.h; sourceTree = "<group>"; };
-               DCB342D51D8A32A20054D16E /* SecCertificatePrivP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCertificatePrivP.h; sourceTree = "<group>"; };
-               DCB342D61D8A32A20054D16E /* SecBase64P.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecBase64P.c; sourceTree = "<group>"; };
-               DCB342D71D8A32A20054D16E /* SecFrameworkP.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecFrameworkP.c; sourceTree = "<group>"; };
-               DCB342D81D8A32A20054D16E /* SecCertificateP.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = SecCertificateP.c; sourceTree = "<group>"; };
-               DCB342D91D8A32A20054D16E /* SecCertificateP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCertificateP.h; sourceTree = "<group>"; };
-               DCB342DA1D8A32A20054D16E /* SecCertificateInternalP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCertificateInternalP.h; sourceTree = "<group>"; };
                DCB342DB1D8A32A20054D16E /* generateErrStrings.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = generateErrStrings.pl; sourceTree = "<group>"; };
                DCB342DC1D8A32A20054D16E /* tsaDERUtilities.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tsaDERUtilities.c; sourceTree = "<group>"; };
                DCB342DD1D8A32A20054D16E /* tsaDERUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tsaDERUtilities.h; sourceTree = "<group>"; };
                DCBDB3B11E57C67500B61300 /* CKKSKeychainView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSKeychainView.m; sourceTree = "<group>"; };
                DCBDB3B91E57CA7A00B61300 /* CKKSViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSViewManager.h; sourceTree = "<group>"; };
                DCBDB3BA1E57CA7A00B61300 /* CKKSViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSViewManager.m; sourceTree = "<group>"; };
+               DCBF2F7C1F90084D00ED0CA4 /* CKKSTLKSharingTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSTLKSharingTests.m; sourceTree = "<group>"; };
+               DCBF2F831F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSHealTLKSharesOperation.h; sourceTree = "<group>"; };
+               DCBF2F841F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSHealTLKSharesOperation.m; sourceTree = "<group>"; };
                DCC0800D1CFF7903005C35C8 /* CSSMOID.exp-in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "CSSMOID.exp-in"; sourceTree = "<group>"; };
                DCC78C371D8085D800865A7C /* ios6_1_keychain_2_db.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ios6_1_keychain_2_db.h; sourceTree = "<group>"; };
                DCC78C381D8085D800865A7C /* ios8-inet-keychain-2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ios8-inet-keychain-2.h"; sourceTree = "<group>"; };
                DCC78C811D8085D800865A7C /* entitlements.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = entitlements.plist; sourceTree = "<group>"; };
                DCC78C8E1D8085D800865A7C /* SecDbItem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecDbItem.c; sourceTree = "<group>"; };
                DCC78C8F1D8085D800865A7C /* SecDbItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecDbItem.h; sourceTree = "<group>"; };
-               DCC78C901D8085D800865A7C /* SecDbKeychainItem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecDbKeychainItem.c; sourceTree = "<group>"; };
+               DCC78C901D8085D800865A7C /* SecDbKeychainItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecDbKeychainItem.m; sourceTree = "<group>"; };
                DCC78C911D8085D800865A7C /* SecDbKeychainItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecDbKeychainItem.h; sourceTree = "<group>"; };
                DCC78C921D8085D800865A7C /* SecDbQuery.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecDbQuery.c; sourceTree = "<group>"; };
                DCC78C931D8085D800865A7C /* SecDbQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecDbQuery.h; sourceTree = "<group>"; };
                DCC78DD71D8085FC00865A7C /* si-50-secrandom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-50-secrandom.c"; sourceTree = "<group>"; };
                DCC78DD81D8085FC00865A7C /* si-60-cms.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-60-cms.c"; sourceTree = "<group>"; };
                DCC78DD91D8085FC00865A7C /* si-61-pkcs12.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-61-pkcs12.c"; sourceTree = "<group>"; };
-               DCC78DDA1D8085FC00865A7C /* si-62-csr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-62-csr.c"; sourceTree = "<group>"; };
+               DCC78DDA1D8085FC00865A7C /* si-62-csr.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "si-62-csr.m"; sourceTree = "<group>"; };
                DCC78DDB1D8085FC00865A7C /* getcacert-mdes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "getcacert-mdes.h"; sourceTree = "<group>"; };
                DCC78DDC1D8085FC00865A7C /* getcacert-mdesqa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "getcacert-mdesqa.h"; sourceTree = "<group>"; };
-               DCC78DDE1D8085FC00865A7C /* si-63-scep.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-63-scep.c"; sourceTree = "<group>"; };
+               DCC78DDE1D8085FC00865A7C /* si-63-scep.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "si-63-scep.m"; sourceTree = "<group>"; };
                DCC78DDF1D8085FC00865A7C /* si-63-scep.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-63-scep.h"; sourceTree = "<group>"; };
                DCC78DE01D8085FC00865A7C /* attached_no_data_signed_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = attached_no_data_signed_data.h; sourceTree = "<group>"; };
                DCC78DE11D8085FC00865A7C /* attached_signed_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = attached_signed_data.h; sourceTree = "<group>"; };
                DCC78E081D8085FC00865A7C /* si-85-sectrust-ssl-policy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-85-sectrust-ssl-policy.h"; sourceTree = "<group>"; };
                DCC78E091D8085FC00865A7C /* si-87-sectrust-name-constraints.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "si-87-sectrust-name-constraints.m"; sourceTree = "<group>"; };
                DCC78E0A1D8085FC00865A7C /* si-87-sectrust-name-constraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-87-sectrust-name-constraints.h"; sourceTree = "<group>"; };
-               DCC78E0B1D8085FC00865A7C /* si-89-cms-hash-agility.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-89-cms-hash-agility.c"; sourceTree = "<group>"; };
+               DCC78E0B1D8085FC00865A7C /* si-89-cms-hash-agility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "si-89-cms-hash-agility.m"; sourceTree = "<group>"; };
                DCC78E0C1D8085FC00865A7C /* si-89-cms-hash-agility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-89-cms-hash-agility.h"; sourceTree = "<group>"; };
                DCC78E0D1D8085FC00865A7C /* si-90-emcs.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "si-90-emcs.m"; sourceTree = "<group>"; };
                DCC78E0E1D8085FC00865A7C /* si-95-cms-basic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-95-cms-basic.c"; sourceTree = "<group>"; };
                DCC78E321D8085FC00865A7C /* SecAccessControlExports.exp-in */ = {isa = PBXFileReference; lastKnownFileType = text; path = "SecAccessControlExports.exp-in"; sourceTree = "<group>"; };
                DCC78E351D8085FC00865A7C /* SecBase64.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SecBase64.c; sourceTree = "<group>"; };
                DCC78E381D8085FC00865A7C /* SecCertificate.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SecCertificate.c; sourceTree = "<group>"; };
-               DCC78E3B1D8085FC00865A7C /* SecCertificatePath.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SecCertificatePath.c; sourceTree = "<group>"; };
                DCC78E3E1D8085FC00865A7C /* SecCertificateRequest.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SecCertificateRequest.c; sourceTree = "<group>"; };
                DCC78E401D8085FC00865A7C /* SecCFAllocator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecCFAllocator.c; sourceTree = "<group>"; };
                DCC78E421D8085FC00865A7C /* SecCMS.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SecCMS.c; sourceTree = "<group>"; };
                DCD06A511D8CE281007602F1 /* libcodehost.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libcodehost.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DCD06A741D8CE2D5007602F1 /* gkunpack */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = gkunpack; sourceTree = BUILT_PRODUCTS_DIR; };
                DCD06AB01D8E0D53007602F1 /* libsecurity_utilities.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsecurity_utilities.a; sourceTree = BUILT_PRODUCTS_DIR; };
-               DCD06AB11D8E0D7D007602F1 /* debugging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = debugging.h; path = ../../utilities/src/debugging.h; sourceTree = "<group>"; };
                DCD06AB21D8E0D7D007602F1 /* FileLockTransaction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = FileLockTransaction.cpp; sourceTree = "<group>"; };
                DCD06AB31D8E0D7D007602F1 /* FileLockTransaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileLockTransaction.h; sourceTree = "<group>"; };
                DCD06AB41D8E0D7D007602F1 /* CSPDLTransaction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CSPDLTransaction.cpp; sourceTree = "<group>"; };
                DCD6C4B01EC5302400414FEE /* CKKSNearFutureScheduler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSNearFutureScheduler.h; sourceTree = "<group>"; };
                DCD6C4B11EC5302500414FEE /* CKKSNearFutureScheduler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSNearFutureScheduler.m; sourceTree = "<group>"; };
                DCD6C4B61EC5319600414FEE /* CKKSNearFutureSchedulerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSNearFutureSchedulerTests.m; sourceTree = "<group>"; };
+               DCD7EE9B1F4F51D9007D9804 /* ios_tapi_hacks.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ios_tapi_hacks.h; sourceTree = "<group>"; };
                DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSecureObjectSyncFramework.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DCDCC7DD1D9B54DF006487E8 /* secd-202-recoverykey.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-202-recoverykey.m"; sourceTree = "<group>"; };
                DCDCC7E41D9B551C006487E8 /* SOSAccountSync.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SOSAccountSync.m; sourceTree = "<group>"; };
                DCF789471D88D17C00E694BB /* AppleX509TPBuiltin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AppleX509TPBuiltin.cpp; path = OSX/libsecurity_apple_x509_tp/lib/AppleX509TPBuiltin.cpp; sourceTree = "<group>"; };
                DCF7A89F1F04502300CABE89 /* CKKSControlProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSControlProtocol.h; sourceTree = "<group>"; };
                DCF7A8A21F0450EB00CABE89 /* CKKSControlProtocol.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSControlProtocol.m; sourceTree = "<group>"; };
+               DCFABF8D20081E2F001128B5 /* CKKSDeviceStateUploadTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSDeviceStateUploadTests.m; sourceTree = "<group>"; };
                DCFAEDC81D999851005187E4 /* SOSAccountGhost.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SOSAccountGhost.m; sourceTree = "<group>"; };
                DCFAEDC91D999851005187E4 /* SOSAccountGhost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSAccountGhost.h; sourceTree = "<group>"; };
                DCFAEDD11D9998DD005187E4 /* secd-668-ghosts.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-668-ghosts.m"; sourceTree = "<group>"; };
                E75C0E801C6FC31D00E6953B /* KCSRPContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KCSRPContext.h; sourceTree = "<group>"; };
                E75C0E811C6FC31D00E6953B /* KCSRPContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KCSRPContext.m; sourceTree = "<group>"; };
                E75C0E841C71325000E6953B /* KeychainCircle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KeychainCircle.h; sourceTree = "<group>"; };
-               E75E498A1C8F76360001A34F /* libDER.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libDER.a; path = ../../../../../usr/local/lib/libDER.a; sourceTree = "<group>"; };
                E75E498C1C8F76680001A34F /* libASN1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libASN1.a; path = ../../../../../usr/local/lib/libASN1.a; sourceTree = "<group>"; };
                E76638AE1DD67B7100B769D3 /* security-sysdiagnose.entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "security-sysdiagnose.entitlements.plist"; sourceTree = "<group>"; };
                E7676DB519411DF300498DD4 /* SecServerEncryptionSupport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecServerEncryptionSupport.h; sourceTree = "<group>"; };
                EB10557A1E14DF640003C309 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
                EB108F121E6CE48B003B0456 /* KCParing.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = KCParing.plist; path = Tests/KCParing.plist; sourceTree = "<group>"; };
                EB108F411E6CE4D2003B0456 /* KCPairingTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KCPairingTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-               EB27FF0B1E402C8000EC9E3A /* ckksctl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ckksctl.h; sourceTree = "<group>"; };
+               EB10A3E320356E2000E84270 /* OTConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OTConstants.h; path = ot/OTConstants.h; sourceTree = "<group>"; };
+               EB10A3E420356E2000E84270 /* OTConstants.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OTConstants.m; path = ot/OTConstants.m; sourceTree = "<group>"; };
                EB27FF0C1E402C8000EC9E3A /* ckksctl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ckksctl.m; sourceTree = "<group>"; };
                EB27FF111E402CD300EC9E3A /* ckksctl */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ckksctl; sourceTree = BUILT_PRODUCTS_DIR; };
                EB27FF2F1E408CC900EC9E3A /* ckksctl-Entitlements.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "ckksctl-Entitlements.plist"; sourceTree = "<group>"; };
                EB433A281CC3243600A7EACE /* secitemstresstest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = secitemstresstest; sourceTree = BUILT_PRODUCTS_DIR; };
                EB433A2D1CC325E900A7EACE /* secitemstresstest.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = secitemstresstest.entitlements; path = secitemstresstest/secitemstresstest.entitlements; sourceTree = "<group>"; };
                EB48C19E1E573EDC00EC5E57 /* sos.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = sos.m; sourceTree = "<group>"; };
+               EB49B2AE202D877F003F34A0 /* secdmockaks.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = secdmockaks.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+               EB49B2B0202D8780003F34A0 /* secdmockaks.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = secdmockaks.m; sourceTree = "<group>"; };
+               EB49B2B2202D8780003F34A0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+               EB49B2CE202DF111003F34A0 /* CoreFollowUp.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFollowUp.framework; path = System/Library/PrivateFrameworks/CoreFollowUp.framework; sourceTree = SDKROOT; };
+               EB49B2DC202DF251003F34A0 /* libbsm.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libbsm.tbd; path = usr/lib/libbsm.tbd; sourceTree = SDKROOT; };
+               EB49B2DE202DF286003F34A0 /* CoreFollowUpUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFollowUpUI.framework; path = System/Library/PrivateFrameworks/CoreFollowUpUI.framework; sourceTree = SDKROOT; };
+               EB49B2E4202DFE7F003F34A0 /* mockaks.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = mockaks.m; sourceTree = "<group>"; };
+               EB49B303202FB8DE003F34A0 /* mockaks.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mockaks.h; sourceTree = "<group>"; };
+               EB4E0CD41FF36A1900CDCACC /* CKKSReachabilityTracker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSReachabilityTracker.h; sourceTree = "<group>"; };
+               EB4E0CD51FF36A1900CDCACC /* CKKSReachabilityTracker.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSReachabilityTracker.m; sourceTree = "<group>"; };
                EB59D66B1E95EF2900997EAC /* libcompression.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcompression.dylib; path = usr/lib/libcompression.dylib; sourceTree = SDKROOT; };
+               EB5E3BC62003C66300F1631B /* SecSignpost.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecSignpost.h; path = base/SecSignpost.h; sourceTree = "<group>"; };
+               EB6667BE204CD65E000B404F /* testPlistDER.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = testPlistDER.m; sourceTree = "<group>"; };
                EB6928BE1D9C9C5900062A18 /* SecRecoveryKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecRecoveryKey.h; sourceTree = "<group>"; };
                EB6928BF1D9C9C5900062A18 /* SecRecoveryKey.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecRecoveryKey.m; sourceTree = "<group>"; };
                EB6928C91D9C9D9D00062A18 /* rk_01_recoverykey.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = rk_01_recoverykey.m; path = Regressions/rk_01_recoverykey.m; sourceTree = "<group>"; };
                EB7AE6F71E86D55400B80B15 /* SecPLWrappers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecPLWrappers.h; path = src/SecPLWrappers.h; sourceTree = "<group>"; };
                EB8021411D3D90BB008540C4 /* Security.iOS.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; name = Security.iOS.modulemap; path = Modules/Security.iOS.modulemap; sourceTree = "<group>"; };
                EB8021421D3D90BB008540C4 /* Security.macOS.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; name = Security.macOS.modulemap; path = Modules/Security.macOS.modulemap; sourceTree = "<group>"; };
+               EB82A2A41FAFF26900CA64A9 /* SFBehavior.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFBehavior.h; sourceTree = "<group>"; };
+               EB82A2A51FAFF26900CA64A9 /* SFBehavior.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFBehavior.m; sourceTree = "<group>"; };
                EB9C02421E8A112A0040D3C6 /* secd-37-pairing-initial-sync.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-37-pairing-initial-sync.m"; sourceTree = "<group>"; };
                EB9C1D7A1BDFD0E000F89272 /* secbackupntest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = secbackupntest; sourceTree = BUILT_PRODUCTS_DIR; };
                EB9C1D7D1BDFD0E100F89272 /* secbackupntest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = secbackupntest.m; sourceTree = "<group>"; };
                EBCF73F11CE45F8600BED7CA /* secitemfunctionality.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = secitemfunctionality.entitlements; path = secitemfunctionality/secitemfunctionality.entitlements; sourceTree = "<group>"; };
                EBCF73F21CE45F8600BED7CA /* secitemfunctionality.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = secitemfunctionality.m; path = secitemfunctionality/secitemfunctionality.m; sourceTree = "<group>"; };
                EBCF73FC1CE45F9C00BED7CA /* secitemfunctionality */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = secitemfunctionality; sourceTree = BUILT_PRODUCTS_DIR; };
+               EBD8AD632004B45500588BBA /* SecurityCustomSignposts.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = SecurityCustomSignposts.plist; path = base/SecurityCustomSignposts.plist; sourceTree = "<group>"; };
                EBE54D771BE33227000C4856 /* libmis.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmis.dylib; path = usr/lib/libmis.dylib; sourceTree = SDKROOT; };
+               EBE700FE204676E700E00A87 /* secdmock_db_version_11_1.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = secdmock_db_version_11_1.h; sourceTree = "<group>"; };
                EBEEEE351EA31A8300E15F5C /* SOSControlHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSControlHelper.h; sourceTree = "<group>"; };
                EBEEEE361EA31A8300E15F5C /* SOSControlHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SOSControlHelper.m; sourceTree = "<group>"; };
                EBF3745E1DBFB32A0065D840 /* libobjc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libobjc.dylib; path = usr/lib/libobjc.dylib; sourceTree = SDKROOT; };
                EBF3747F1DC057FE0065D840 /* security-sysdiagnose.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = "security-sysdiagnose.1"; sourceTree = "<group>"; };
                EBF3749A1DC064200065D840 /* SecADWrapper.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = SecADWrapper.c; path = src/SecADWrapper.c; sourceTree = "<group>"; };
                EBF3749B1DC064200065D840 /* SecADWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecADWrapper.h; path = src/SecADWrapper.h; sourceTree = "<group>"; };
+               EBF9AE171F536D0300FECBF7 /* Version.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Version.xcconfig; path = xcconfig/Version.xcconfig; sourceTree = "<group>"; };
                F619D71D1ED70BB0005B5F46 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = OSX/authorizationdump/main.m; sourceTree = "<group>"; };
                F621D07F1ED6DCE7000EA569 /* authorizationdump */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = authorizationdump; sourceTree = BUILT_PRODUCTS_DIR; };
                F667EC551E96E94800203D5C /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = OSX/authd/tests/main.m; sourceTree = "<group>"; };
                F667EC601E96E9B100203D5C /* authdtest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = authdtest; sourceTree = BUILT_PRODUCTS_DIR; };
+               F682C1CE1F4486F600F1B029 /* libctkloginhelper.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libctkloginhelper.a; path = usr/local/lib/libctkloginhelper.a; sourceTree = SDKROOT; };
                F6A0971E1E953A1500B1E7D6 /* authdtestlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = authdtestlist.h; path = OSX/authd/tests/authdtestlist.h; sourceTree = "<group>"; };
                F6A0971F1E953ABD00B1E7D6 /* authdtests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = authdtests.m; path = OSX/authd/tests/authdtests.m; sourceTree = "<group>"; };
                F6A3CB0D1E7062BA00E7821F /* authd-Entitlements.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "authd-Entitlements.plist"; path = "OSX/authd/authd-Entitlements.plist"; sourceTree = "<group>"; };
                                438168C51B4ED43B00C54D58 /* CoreFoundation.framework in Frameworks */,
                                EB3409B01C1D627400D77661 /* Foundation.framework in Frameworks */,
                                DCD22D8B1D8CCC58001C9B81 /* libASN1_not_installed.a in Frameworks */,
-                               DC59EA911D91CDCF001BDDF5 /* libDER_not_installed.a in Frameworks */,
                                DC59E9A71D91C7C7001BDDF5 /* libCMS.a in Frameworks */,
                                DC00ABD71D821F3F00513D74 /* libsecurity.a in Frameworks */,
                                DC00ABD81D821F4300513D74 /* libsecdRegressions.a in Frameworks */,
                                0C0BDB8D1756A66100BC1A7E /* CFNetwork.framework in Frameworks */,
                                0C0BDB911756A8A400BC1A7E /* IOKit.framework in Frameworks */,
                                0C0BDB931756A8C900BC1A7E /* SystemConfiguration.framework in Frameworks */,
+                               D46246B81F9AE77900D63882 /* libDER.a in Frameworks */,
                                5E8B53A51AA0B8A600345E7B /* libcoreauthd_test_client.a in Frameworks */,
                                4432B15F1A014D55000958DC /* libaks_acl.a in Frameworks */,
                                0C0BDB8F1756A6D500BC1A7E /* libMobileGestalt.dylib in Frameworks */,
                                0C0BDB881756A51000BC1A7E /* libsqlite3.dylib in Frameworks */,
                                BE8ABDD81DC2DD9100EC2D58 /* libz.dylib in Frameworks */,
+                               0C59605D1FB2D95D0095BA29 /* libprequelite.tbd in Frameworks */,
                                4469FBFF1AA0A4820021AA26 /* libctkclient_test.a in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
+               0C85DFE51FB38BB6000343A7 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               0C85DFE71FB38BB6000343A7 /* libASN1_not_installed.a in Frameworks */,
+                               0C85DFE81FB38BB6000343A7 /* libsecurityd_ios_NO_AKS.a in Frameworks */,
+                               0C85DFE91FB38BB6000343A7 /* libSecureObjectSyncFramework.a in Frameworks */,
+                               0C85DFEA1FB38BB6000343A7 /* libSecureObjectSyncServer.a in Frameworks */,
+                               0C85DFEB1FB38BB6000343A7 /* libsecurity.a in Frameworks */,
+                               0C85DFEC1FB38BB6000343A7 /* libutilities.a in Frameworks */,
+                               0C85DFED1FB38BB6000343A7 /* CFNetwork.framework in Frameworks */,
+                               0C85DFEE1FB38BB6000343A7 /* Foundation.framework in Frameworks */,
+                               0C85DFF01FB38BB6000343A7 /* IOKit.framework in Frameworks */,
+                               0C85DFF11FB38BB6000343A7 /* OCMock.framework in Frameworks */,
+                               0C0DA5CE1FE1EAB9003BD3BB /* SecurityFoundation.framework in Frameworks */,
+                               0C85DFF31FB38BB6000343A7 /* SystemConfiguration.framework in Frameworks */,
+                               0C85DFF41FB38BB6000343A7 /* libACM.a in Frameworks */,
+                               0C85DFF51FB38BB6000343A7 /* libaks_acl.a in Frameworks */,
+                               0C85DFF61FB38BB6000343A7 /* libDER.a in Frameworks */,
+                               0C85DFF71FB38BB6000343A7 /* libbsm.dylib in Frameworks */,
+                               0C85DFF81FB38BB6000343A7 /* libcoreauthd_client.a in Frameworks */,
+                               0C85DFF91FB38BB6000343A7 /* libctkclient.a in Frameworks */,
+                               0C85DFFA1FB38BB6000343A7 /* libsqlite3.0.dylib in Frameworks */,
+                               0C85DFFB1FB38BB6000343A7 /* libz.dylib in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               0C8BBF021FCB446400580909 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               0C8BBF031FCB446400580909 /* Security.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                225394AF1E3080A600D3CD9B /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
+               4727FBB41F9918580003AE36 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               477A1F5220320E4A00ACD81D /* Accounts.framework in Frameworks */,
+                               472339691FD7156800CB6A72 /* CoreCDP.framework in Frameworks */,
+                               472339671FD7155E00CB6A72 /* libprequelite.dylib in Frameworks */,
+                               47D183911FB3827800CFCD89 /* OCMock.framework in Frameworks */,
+                               4727FBEA1F9922190003AE36 /* libregressionBase.a in Frameworks */,
+                               4727FBE91F9921D10003AE36 /* libACM.a in Frameworks */,
+                               4727FBE71F99218A0003AE36 /* ApplePushService.framework in Frameworks */,
+                               4727FBE51F99217B0003AE36 /* SharedWebCredentials.framework in Frameworks */,
+                               4727FBE31F9921660003AE36 /* MobileKeyBag.framework in Frameworks */,
+                               4727FBE11F9921300003AE36 /* IOKit.framework in Frameworks */,
+                               4727FBDF1F99211D0003AE36 /* libaks.a in Frameworks */,
+                               4727FBDD1F9920F20003AE36 /* libaks_acl.a in Frameworks */,
+                               4727FBDB1F9920CC0003AE36 /* WirelessDiagnostics.framework in Frameworks */,
+                               4727FBD91F9920BC0003AE36 /* SystemConfiguration.framework in Frameworks */,
+                               4727FBD71F99209C0003AE36 /* libSecureObjectSyncServer.a in Frameworks */,
+                               4727FBD61F9920960003AE36 /* libSecureObjectSyncFramework.a in Frameworks */,
+                               4727FBD51F9920510003AE36 /* ProtocolBuffer.framework in Frameworks */,
+                               4727FBD31F9920290003AE36 /* CloudKit.framework in Frameworks */,
+                               4727FBD11F991F990003AE36 /* libMobileGestalt.dylib in Frameworks */,
+                               4727FBCE1F991F820003AE36 /* SecurityFoundation.framework in Frameworks */,
+                               4727FBCD1F991F660003AE36 /* libsqlite3.dylib in Frameworks */,
+                               4727FBCB1F991F510003AE36 /* Security.framework in Frameworks */,
+                               4727FBC91F991E5A0003AE36 /* libutilities.a in Frameworks */,
+                               4727FBC81F991E460003AE36 /* libsecurityd_ios.a in Frameworks */,
+                               4727FBC71F991E3A0003AE36 /* libsecurity.a in Frameworks */,
+                               4727FBC61F991DE90003AE36 /* libsecdRegressions.a in Frameworks */,
+                               4727FBC51F991C470003AE36 /* Foundation.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                47702B1B1E5F409700B29577 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
+               478D427D1FD72A8100CAB645 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               477A1F5320320E5100ACD81D /* Accounts.framework in Frameworks */,
+                               478D429F1FD72C8400CAB645 /* AppleSystemInfo.framework in Frameworks */,
+                               478D429E1FD72C4800CAB645 /* CrashReporterSupport.framework in Frameworks */,
+                               478D427E1FD72A8100CAB645 /* CoreCDP.framework in Frameworks */,
+                               478D427F1FD72A8100CAB645 /* libprequelite.dylib in Frameworks */,
+                               478D42801FD72A8100CAB645 /* OCMock.framework in Frameworks */,
+                               478D42811FD72A8100CAB645 /* libregressionBase.a in Frameworks */,
+                               478D42821FD72A8100CAB645 /* libACM.a in Frameworks */,
+                               478D42831FD72A8100CAB645 /* ApplePushService.framework in Frameworks */,
+                               478D42841FD72A8100CAB645 /* SharedWebCredentials.framework in Frameworks */,
+                               478D42851FD72A8100CAB645 /* MobileKeyBag.framework in Frameworks */,
+                               478D42861FD72A8100CAB645 /* IOKit.framework in Frameworks */,
+                               478D42871FD72A8100CAB645 /* libaks.a in Frameworks */,
+                               478D42881FD72A8100CAB645 /* libaks_acl.a in Frameworks */,
+                               478D42891FD72A8100CAB645 /* WirelessDiagnostics.framework in Frameworks */,
+                               478D428A1FD72A8100CAB645 /* SystemConfiguration.framework in Frameworks */,
+                               478D428B1FD72A8100CAB645 /* libSecureObjectSyncServer.a in Frameworks */,
+                               478D428C1FD72A8100CAB645 /* libSecureObjectSyncFramework.a in Frameworks */,
+                               478D428D1FD72A8100CAB645 /* ProtocolBuffer.framework in Frameworks */,
+                               478D428E1FD72A8100CAB645 /* CloudKit.framework in Frameworks */,
+                               478D42901FD72A8100CAB645 /* SecurityFoundation.framework in Frameworks */,
+                               478D42911FD72A8100CAB645 /* libsqlite3.dylib in Frameworks */,
+                               478D42921FD72A8100CAB645 /* Security.framework in Frameworks */,
+                               478D42931FD72A8100CAB645 /* libutilities.a in Frameworks */,
+                               478D42941FD72A8100CAB645 /* libsecurityd_ios.a in Frameworks */,
+                               478D42951FD72A8100CAB645 /* libsecurity.a in Frameworks */,
+                               478D42961FD72A8100CAB645 /* libsecdRegressions.a in Frameworks */,
+                               478D42971FD72A8100CAB645 /* Foundation.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                47C51B811EEA657D0032D9E5 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                                DC3A81D51D99D568000C7419 /* libcoretls_cfhelpers.dylib in Frameworks */,
                                5296CB4E1655B8F5009912AF /* libMobileGestalt.dylib in Frameworks */,
                                DCD8A19A1E09EE9800E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */,
-                               DC59EA771D91CC6D001BDDF5 /* libDER_not_installed.a in Frameworks */,
                                0C78F1D016A5E3EB00654E08 /* libbsm.dylib in Frameworks */,
+                               D46246971F9AE2E400D63882 /* libDER.a in Frameworks */,
                                DCD22D771D8CC9CD001C9B81 /* libASN1_not_installed.a in Frameworks */,
                                44A655831AA4B4BB0059D185 /* libctkclient.a in Frameworks */,
                                DC59E9A41D91C6F0001BDDF5 /* libCMS.a in Frameworks */,
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               47B90C951F3509C1006500BC /* CrashReporterSupport.framework in Frameworks */,
+                               D4C6C5CF1FB3B44D007EA57E /* libarchive.2.dylib in Frameworks */,
                                D40B6A8E1E2B643500CD6EE5 /* libtrustd.a in Frameworks */,
                                DC00ABB31D821E0400513D74 /* libSharedRegressions.a in Frameworks */,
                                EBE9019C1C2285DB007308C6 /* AggregateDictionary.framework in Frameworks */,
                                DCD22D9A1D8CCFC1001C9B81 /* libutilities.a in Frameworks */,
                                DC00ABB51D821E0B00513D74 /* libSecureObjectSyncServer.a in Frameworks */,
                                DCD8A1F91E09F98E00E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */,
+                               D46246B51F9AE74000D63882 /* libDER.a in Frameworks */,
                                DCD22D9B1D8CCFCB001C9B81 /* libASN1_not_installed.a in Frameworks */,
-                               DC59EA851D91CD35001BDDF5 /* libDER_not_installed.a in Frameworks */,
                                DC65E7771D8CB82500152EF0 /* libregressionBase.a in Frameworks */,
                                438168C01B4ED42C00C54D58 /* CoreFoundation.framework in Frameworks */,
                                DCD22D9C1D8CCFD6001C9B81 /* libutilitiesRegressions.a in Frameworks */,
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               0C59605C1FB2D9280095BA29 /* libprequelite.tbd in Frameworks */,
                                47D13F631E8447FB0063B6E2 /* SecurityFoundation.framework in Frameworks */,
-                               EB7F50C51DB8800A003D787D /* CoreCDP.framework in Frameworks */,
                                EBE9019A1C22852C007308C6 /* AggregateDictionary.framework in Frameworks */,
                                438168BB1B4ED42300C54D58 /* CoreFoundation.framework in Frameworks */,
                                DC00AB8E1D821D4900513D74 /* libSOSCommands.a in Frameworks */,
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               0C8BBF261FCB561C00580909 /* CoreCDP.framework in Frameworks */,
+                               0C59605A1FB2D8E50095BA29 /* libprequelite.tbd in Frameworks */,
+                               D46246BA1F9AE7A000D63882 /* libDER.a in Frameworks */,
                                DCCD34001E4001AD00AA4AD1 /* libACM.a in Frameworks */,
                                DCAB14271E40039600C81511 /* libASN1_not_installed.a in Frameworks */,
-                               DC59EA8E1D91CDC1001BDDF5 /* libDER_not_installed.a in Frameworks */,
                                EBF2D73C1C1E2B47006AB6FF /* Foundation.framework in Frameworks */,
                                DCD22D801D8CCB0F001C9B81 /* libutilities.a in Frameworks */,
                                DC00ABCC1D821F0B00513D74 /* libsecurityd_ios.a in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
+               6C46059B1F882B9B001421B6 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D4574AA3203E68E0006D9B82 /* AuthKit.framework in Frameworks */,
+                               D4574AA1203E6893006D9B82 /* Accounts.framework in Frameworks */,
+                               D4119E79202BDF580048587B /* libz.tbd in Frameworks */,
+                               6CDB601B1FA93A2000410924 /* libprequelite.tbd in Frameworks */,
+                               6CDB601A1FA93A1800410924 /* libsqlite3.tbd in Frameworks */,
+                               6CDB60111FA9386200410924 /* Security.framework in Frameworks */,
+                               D4119E882032A8FA0048587B /* OCMock.framework in Frameworks */,
+                               6C13AE481F8E9FC800F047E3 /* libutilities.a in Frameworks */,
+                               6C4605A51F882B9B001421B6 /* Foundation.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                6C9808481E788AEB00E70590 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               6C9808491E788AEB00E70590 /* libDER_not_installed.a in Frameworks */,
+                               6CAA8CDD1F82EDEF007B6E03 /* Security.framework in Frameworks */,
+                               D46246BC1F9AE82B00D63882 /* libDER.a in Frameworks */,
                                6C98084A1E788AEB00E70590 /* libASN1_not_installed.a in Frameworks */,
                                6C98084C1E788AEB00E70590 /* libsecurityd_ios_NO_AKS.a in Frameworks */,
                                6C98084D1E788AEB00E70590 /* libSecureObjectSyncFramework.a in Frameworks */,
                                6C9808581E788AEB00E70590 /* libbsm.dylib in Frameworks */,
                                6C9808591E788AEB00E70590 /* libcoreauthd_client.a in Frameworks */,
                                6C98085A1E788AEB00E70590 /* libctkclient.a in Frameworks */,
+                               0C5960651FB2E2800095BA29 /* libprequelite.tbd in Frameworks */,
                                6C98085B1E788AEB00E70590 /* libsqlite3.0.dylib in Frameworks */,
                                6C98085C1E788AEB00E70590 /* libz.dylib in Frameworks */,
                        );
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               6C9808851E788AFD00E70590 /* libDER_not_installed.a in Frameworks */,
+                               6CAA8CEE1F83E417007B6E03 /* Security.framework in Frameworks */,
+                               D46246BD1F9AE83600D63882 /* libDER.a in Frameworks */,
                                6C9808861E788AFD00E70590 /* libASN1_not_installed.a in Frameworks */,
                                6C9808881E788AFD00E70590 /* libsecurityd_ios_NO_AKS.a in Frameworks */,
                                6C9808891E788AFD00E70590 /* libSecureObjectSyncFramework.a in Frameworks */,
                                6C9808941E788AFD00E70590 /* libbsm.dylib in Frameworks */,
                                6C9808951E788AFD00E70590 /* libcoreauthd_client.a in Frameworks */,
                                6C9808961E788AFD00E70590 /* libctkclient.a in Frameworks */,
+                               0C59605F1FB2D9F60095BA29 /* libprequelite.tbd in Frameworks */,
                                6C9808971E788AFD00E70590 /* libsqlite3.0.dylib in Frameworks */,
                                6C9808981E788AFD00E70590 /* libz.dylib in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
+               6C9AA79B1F7C1D8F00D08296 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               6C7FD5DF1F87FA42002C2285 /* Security.framework in Frameworks */,
+                               6C1260FD1F7DA42D001B2EEC /* Foundation.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               6CAA8D1D1F842FB3007B6E03 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D4574AA2203E68C8006D9B82 /* AuthKit.framework in Frameworks */,
+                               D4574AA0203E618B006D9B82 /* Accounts.framework in Frameworks */,
+                               D4119E78202BDF490048587B /* libz.tbd in Frameworks */,
+                               6CAA8D3B1F8431AE007B6E03 /* Foundation.framework in Frameworks */,
+                               6CAA8D3A1F8431A7007B6E03 /* libutilities.a in Frameworks */,
+                               6CAA8D371F843196007B6E03 /* Security.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                6CCDF7811E3C25FA003F2555 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               728B569E16D59979008FA3AB /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               72DF9EFE178360230054641E /* libMobileGestalt.dylib in Frameworks */,
-                               72C3EC2E1705F24E0040C87C /* ManagedConfiguration.framework in Frameworks */,
-                               72CD2BCE16D59B010064EEE1 /* MobileAsset.framework in Frameworks */,
-                               72CD2BCD16D59AF30064EEE1 /* Security.framework in Frameworks */,
-                               728B56A216D59979008FA3AB /* Foundation.framework in Frameworks */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                790851B40CA9859F0083CC4D /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                                DC00AB821D821C9500513D74 /* libSecureObjectSyncServer.a in Frameworks */,
                                DCD8A1E71E09F85400E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */,
                                DC00AB831D821C9A00513D74 /* libSWCAgent.a in Frameworks */,
-                               DC59EA7E1D91CCB2001BDDF5 /* libDER_not_installed.a in Frameworks */,
                                790851EE0CA9B3410083CC4D /* Security.framework in Frameworks */,
                                E71F3E3116EA69A900FAF9B4 /* SystemConfiguration.framework in Frameworks */,
                                4CAF66190F3A6FCD0064A534 /* IOKit.framework in Frameworks */,
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               D46246AA1F9AE6CA00D63882 /* libDER.a in Frameworks */,
                                D41258011E94230400781F23 /* IOKit.framework in Frameworks */,
                                D41257E01E94136000781F23 /* libz.dylib in Frameworks */,
                                D41257DF1E94133600781F23 /* CFNetwork.framework in Frameworks */,
                                D41257DE1E94132900781F23 /* libsqlite3.dylib in Frameworks */,
-                               D41257DC1E94130C00781F23 /* libDER_not_installed.a in Frameworks */,
                                D41257DB1E9412E700781F23 /* libutilities.a in Frameworks */,
                                D41257DA1E9412DC00781F23 /* libtrustd.a in Frameworks */,
                                D41257E21E94138600781F23 /* CoreFoundation.framework in Frameworks */,
                                DC3A81D61D99D57F000C7419 /* libcoretls.dylib in Frameworks */,
                                DC3A81D71D99D58A000C7419 /* libcoretls_cfhelpers.dylib in Frameworks */,
                                DC1789291D779A2800B50D50 /* libctkclient.a in Frameworks */,
+                               D46246C91F9AEA5300D63882 /* libDER.a in Frameworks */,
                                DC17891D1D77999700B50D50 /* libpam.dylib in Frameworks */,
                                DC17891F1D77999D00B50D50 /* libsqlite3.dylib in Frameworks */,
                                DC1789211D7799A100B50D50 /* libxar.dylib in Frameworks */,
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               D46246BE1F9AE86400D63882 /* libDER.a in Frameworks */,
                                47A0ABA81E6F7B24001B388C /* SecurityFoundation.framework in Frameworks */,
-                               DC3502C81E020D5B00BC0587 /* libDER_not_installed.a in Frameworks */,
                                DC3502C51E020D5100BC0587 /* libASN1_not_installed.a in Frameworks */,
                                DC222C7A1E034EF700B09171 /* libsecurityd_ios_NO_AKS.a in Frameworks */,
                                DC0984FD1E1DB6DF00140ADC /* libSecureObjectSyncFramework.a in Frameworks */,
                                DC3502D61E02118000BC0587 /* libsecurity.a in Frameworks */,
                                DC3502CF1E020E2900BC0587 /* libutilities.a in Frameworks */,
                                DC222C351E02418100B09171 /* CFNetwork.framework in Frameworks */,
+                               0C8BBF2B1FCB575800580909 /* CoreCDP.framework in Frameworks */,
                                DC3502DF1E02129F00BC0587 /* Foundation.framework in Frameworks */,
                                DC3502D21E02113900BC0587 /* IOKit.framework in Frameworks */,
                                DC3502E91E02172C00BC0587 /* OCMock.framework in Frameworks */,
                                DC222C361E02419B00B09171 /* libbsm.dylib in Frameworks */,
                                DC3502E41E02130600BC0587 /* libcoreauthd_client.a in Frameworks */,
                                DC3502E21E0212D100BC0587 /* libctkclient.a in Frameworks */,
+                               0C5960601FB2DA310095BA29 /* libprequelite.tbd in Frameworks */,
                                DC3502CA1E020DC100BC0587 /* libsqlite3.0.dylib in Frameworks */,
                                DC222C321E0240D300B09171 /* libz.dylib in Frameworks */,
                        );
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               DC59E9E81D91C9DC001BDDF5 /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               DC59EA211D91CA15001BDDF5 /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               DC59EA341D91CA82001BDDF5 /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               DC59EA511D91CAE8001BDDF5 /* libDERUtils.a in Frameworks */,
-                               DC59EA501D91CAE3001BDDF5 /* libDER_not_installed.a in Frameworks */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               DC59EA591D91CAF0001BDDF5 /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               DC59EA5A1D91CAF0001BDDF5 /* libDERUtils.a in Frameworks */,
-                               DC59EA5B1D91CAF0001BDDF5 /* libDER_not_installed.a in Frameworks */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               DC59EA691D91CB9F001BDDF5 /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               DC59EA741D91CBD0001BDDF5 /* libcrypto.dylib in Frameworks */,
-                               DC59EA6B1D91CB9F001BDDF5 /* libDER_not_installed.a in Frameworks */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                DC5ABDC21D832DAB00CF422C /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               0CA4EC10202BB5AF002B1D96 /* Accounts.framework in Frameworks */,
+                               0C8BBF2D1FCB5A2900580909 /* CoreCDP.framework in Frameworks */,
+                               0C5960631FB2E1A70095BA29 /* libprequelite.tbd in Frameworks */,
                                47B90C901F350966006500BC /* CrashReporterSupport.framework in Frameworks */,
                                474B5FC81E662E79007546F8 /* SecurityFoundation.framework in Frameworks */,
                                D43B88721E72298500F86F19 /* MobileAsset.framework in Frameworks */,
                                DC610A3B1D78F234002223DE /* libACM.a in Frameworks */,
                                DC610A391D78F1B7002223DE /* libaks.a in Frameworks */,
                                DC610A2C1D78F129002223DE /* libaks_acl.a in Frameworks */,
+                               D46246B91F9AE79000D63882 /* libDER.a in Frameworks */,
                                DCD22D601D8CC2EF001C9B81 /* libASN1_not_installed.a in Frameworks */,
-                               DC59EA941D91CDE0001BDDF5 /* libDER_not_installed.a in Frameworks */,
                                DCD22D611D8CC2F8001C9B81 /* libbsm.dylib in Frameworks */,
                                DC610A2B1D78F129002223DE /* libcoreauthd_test_client.a in Frameworks */,
                                DC610A2F1D78F129002223DE /* libctkclient_test.a in Frameworks */,
                                DC00ABE81D821F7D00513D74 /* libsecurityd_ios.a in Frameworks */,
                                D40B6A901E2B673500CD6EE5 /* libtrustd.a in Frameworks */,
                                DCD22D631D8CC33A001C9B81 /* libSOSRegressions.a in Frameworks */,
+                               DCB332451F47856B00178C30 /* libSOSCommands.a in Frameworks */,
                                DCD22D641D8CC341001C9B81 /* libutilities.a in Frameworks */,
                                DCD22D651D8CC349001C9B81 /* libutilitiesRegressions.a in Frameworks */,
                                DCDCCB3A1DF25D1D006E840E /* ApplePushService.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               DC71D9F71D95BB0A0065FB93 /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                DC8834041D8A218F00CE0ACA /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               DC59EA9A1D91CE94001BDDF5 /* libDER_not_installed.a in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               0C5960621FB2E0EC0095BA29 /* libprequelite.tbd in Frameworks */,
                                6C1F93111DD5E41A00585608 /* libDiagnosticMessagesClient.dylib in Frameworks */,
-                               EB7F50CC1DB88A03003D787D /* CoreCDP.framework in Frameworks */,
                                DCE4E6AE1D7A3C6A00AFB96E /* AppleSystemInfo.framework in Frameworks */,
                                DCE4E6AD1D7A3B9700AFB96E /* libaks.a in Frameworks */,
                                DCE4E6AC1D7A3B5000AFB96E /* libACM.a in Frameworks */,
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               D4C6C5CD1FB3B423007EA57E /* libarchive.tbd in Frameworks */,
+                               D46246B71F9AE76500D63882 /* libDER.a in Frameworks */,
                                DC3A81EC1D99F568000C7419 /* libcoretls.dylib in Frameworks */,
                                DCE4E7C61D7A468300AFB96E /* libaks.a in Frameworks */,
                                DCE4E75E1D7A43B500AFB96E /* CoreFoundation.framework in Frameworks */,
                                DCE4E7541D7A43B500AFB96E /* Foundation.framework in Frameworks */,
                                DCE4E7681D7A43B500AFB96E /* IOKit.framework in Frameworks */,
                                DC65E7751D8CB81000152EF0 /* libregressionBase.a in Frameworks */,
-                               DC59EA8B1D91CD93001BDDF5 /* libDER_not_installed.a in Frameworks */,
+                               DC26710E1F3E932D00816EED /* libASN1_not_installed.a in Frameworks */,
                                DC00ABC71D821EF400513D74 /* libSharedRegressions.a in Frameworks */,
                                DCD22D551D8CC148001C9B81 /* libsecurity_keychain_regressions.a in Frameworks */,
                                DC63CAF81D91A15F00C03317 /* libsecurity_cms_regressions.a in Frameworks */,
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               D46246BB1F9AE7B300D63882 /* libDER.a in Frameworks */,
                                DCD22D5F1D8CC294001C9B81 /* libsecurity_ssl_regressions.a in Frameworks */,
                                DCE4E7E41D7A4B8F00AFB96E /* Foundation.framework in Frameworks */,
                                DCE4E7EF1D7A4BCB00AFB96E /* libaks.a in Frameworks */,
-                               DC59EA971D91CDFA001BDDF5 /* libDER_not_installed.a in Frameworks */,
                                DC65E7C21D8CBB5800152EF0 /* libregressionBase.a in Frameworks */,
                                DCE4E7EC1D7A4BB800AFB96E /* Security.framework in Frameworks */,
                                DCE4E7EB1D7A4BB200AFB96E /* SecurityFoundation.framework in Frameworks */,
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               0CA4EC11202BB5E9002B1D96 /* Accounts.framework in Frameworks */,
+                               0C5960641FB2E2070095BA29 /* libprequelite.tbd in Frameworks */,
                                4710A6D91F34F21700745267 /* CrashReporterSupport.framework in Frameworks */,
                                D41D36711EB14D87007FA978 /* libDiagnosticMessagesClient.tbd in Frameworks */,
                                474B5FC61E662E48007546F8 /* SecurityFoundation.framework in Frameworks */,
                                6C5B36C01E2F9BEA008AD443 /* WirelessDiagnostics.framework in Frameworks */,
                                CD9F2AF91DF249B400AD3577 /* Foundation.framework in Frameworks */,
                                DCE4E8281D7A4F1600AFB96E /* login.framework in Frameworks */,
+                               D46246D91F9AED5D00D63882 /* libDER.a in Frameworks */,
                                DCE4E8251D7A4EE400AFB96E /* libACM.a in Frameworks */,
                                DCE4E8241D7A4ECD00AFB96E /* libaks.a in Frameworks */,
                                DCE4E8231D7A4EC900AFB96E /* libaks_acl.a in Frameworks */,
                                DCD22D711D8CC78E001C9B81 /* libASN1_not_installed.a in Frameworks */,
-                               DC59EA7B1D91CC9F001BDDF5 /* libDER_not_installed.a in Frameworks */,
                                DCE4E8201D7A4EAC00AFB96E /* libcoreauthd_client.a in Frameworks */,
                                DCE4E81F1D7A4EA700AFB96E /* libctkclient.a in Frameworks */,
                                DCE4E81C1D7A4E8F00AFB96E /* libsqlite3.0.dylib in Frameworks */,
                                DCD22D721D8CC804001C9B81 /* SystemConfiguration.framework in Frameworks */,
                                DCE4E80F1D7A4E4600AFB96E /* Security.framework in Frameworks */,
                                DC4DB16A1E26E9F900CD6769 /* ProtocolBuffer.framework in Frameworks */,
+                               0C8BBFFD1FCE8F3300580909 /* CoreCDP.framework in Frameworks */,
                                DCE4E82C1D7A56FF00AFB96E /* AppleSystemInfo.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               D46246D41F9AEAE300D63882 /* libDER.a in Frameworks */,
                                D40B6A9A1E2B68E800CD6EE5 /* libbsm.dylib in Frameworks */,
                                D40B6A991E2B68A400CD6EE5 /* libz.dylib in Frameworks */,
                                D40B6A981E2B687F00CD6EE5 /* libDiagnosticMessagesClient.dylib in Frameworks */,
                                D40B6A9E1E2B6A6F00CD6EE5 /* libtrustd.a in Frameworks */,
                                D40B6A931E2B67E500CD6EE5 /* libutilities.a in Frameworks */,
                                D40B6A831E2B5F5B00CD6EE5 /* libASN1_not_installed.a in Frameworks */,
-                               D40B6A821E2B5F5600CD6EE5 /* libDER_not_installed.a in Frameworks */,
                                D40B6A9D1E2B6A2700CD6EE5 /* login.framework in Frameworks */,
                                D4ADA3311E2B43450031CEA3 /* CFNetwork.framework in Frameworks */,
                                D4ADA3301E2B433B0031CEA3 /* Security.framework in Frameworks */,
                                DCE4E8C61D7F354700AFB96E /* CoreFoundation.framework in Frameworks */,
                                DCE4E8C51D7F354300AFB96E /* IOKit.framework in Frameworks */,
                                F6AF96681E646CAF00917214 /* libcoreauthd_client.a in Frameworks */,
+                               F682C1D41F4486F700F1B029 /* libctkloginhelper.a in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               D4C6C5D01FB3B45E007EA57E /* libarchive.2.dylib in Frameworks */,
+                               0C59605E1FB2D9990095BA29 /* libprequelite.tbd in Frameworks */,
                                D40B6A8F1E2B643D00CD6EE5 /* libtrustd.a in Frameworks */,
                                DC00ABC01D821EBE00513D74 /* libSharedRegressions.a in Frameworks */,
                                EBE9019B1C2285D4007308C6 /* AggregateDictionary.framework in Frameworks */,
                                DC00ABC11D821EC300513D74 /* libsecurityd_ios.a in Frameworks */,
                                DC00ABC21D821EC600513D74 /* libSecureObjectSyncServer.a in Frameworks */,
                                DCD8A1F31E09F91700E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */,
-                               DC59EA881D91CD7E001BDDF5 /* libDER_not_installed.a in Frameworks */,
+                               D46246B61F9AE75100D63882 /* libDER.a in Frameworks */,
                                DCD22D931D8CCD17001C9B81 /* libASN1_not_installed.a in Frameworks */,
                                DCD22D941D8CCDFA001C9B81 /* libutilities.a in Frameworks */,
                                DC17890B1D77980500B50D50 /* Security.framework in Frameworks */,
                                DC00ABA51D821DCD00513D74 /* libsecurity.a in Frameworks */,
                                DCD8A1F61E09F96900E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */,
                                DCD22D541D8CC0FC001C9B81 /* libutilities.a in Frameworks */,
-                               DC59EA821D91CD24001BDDF5 /* libDER_not_installed.a in Frameworks */,
                                DCD22D531D8CC0EF001C9B81 /* libASN1_not_installed.a in Frameworks */,
                                E7F482A11C7543E500390FDB /* libsqlite3.dylib in Frameworks */,
                                E7F482A31C7544E600390FDB /* libctkclient_test.a in Frameworks */,
                                EB75B4891E75402400E469CC /* IOKit.framework in Frameworks */,
                                EB75B48A1E75405100E469CC /* libsecurity.a in Frameworks */,
                                EB75B48C1E75407C00E469CC /* libutilities.a in Frameworks */,
-                               EB75B48E1E75408C00E469CC /* libDER_not_installed.a in Frameworks */,
                                EB75B48D1E75408900E469CC /* libASN1_not_installed.a in Frameworks */,
                                EB75B48F1E75409A00E469CC /* libsqlite3.dylib in Frameworks */,
                                EB75B4901E7540AA00E469CC /* libctkclient_test.a in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
+               EB49B2AB202D877F003F34A0 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               EB49B2C2202DF002003F34A0 /* libDER.a in Frameworks */,
+                               EB49B2BD202DEF29003F34A0 /* libSecureObjectSyncFramework.a in Frameworks */,
+                               EB49B2BE202DEF29003F34A0 /* libSecureObjectSyncServer.a in Frameworks */,
+                               EB49B2BB202D8894003F34A0 /* libsecurityd_ios.a in Frameworks */,
+                               EB49B2BF202DEF67003F34A0 /* libsecurity.a in Frameworks */,
+                               EB49B2C1202DEF8D003F34A0 /* libASN1_not_installed.a in Frameworks */,
+                               EB49B2C0202DEF7D003F34A0 /* libutilities.a in Frameworks */,
+                               EB49B308202FF421003F34A0 /* OCMock.framework in Frameworks */,
+                               EB49B2E2202DFDA3003F34A0 /* CoreCDP.framework in Frameworks */,
+                               EB49B2D2202DF17D003F34A0 /* SecurityFoundation.framework in Frameworks */,
+                               EB49B2CD202DF0F9003F34A0 /* SystemConfiguration.framework in Frameworks */,
+                               EB49B2C7202DF0E9003F34A0 /* IOKit.framework in Frameworks */,
+                               EB49B2DD202DF259003F34A0 /* libbsm.tbd in Frameworks */,
+                               EB49B2BC202DEF14003F34A0 /* libsqlite3.tbd in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                EB9C1D771BDFD0E000F89272 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               DC2670F61F3E714000816EED /* libSecureObjectSyncServer.a in Frameworks */,
+                               DCE5DC121EA80369006308A6 /* libSOSCommands.a in Frameworks */,
                                EBF3747E1DC057B40065D840 /* Security.framework in Frameworks */,
                                E76638A81DD679BC00B769D3 /* libutilities.a in Frameworks */,
                        );
                        path = regressions;
                        sourceTree = "<group>";
                };
+               0C7CEA391FE9CE3900125C79 /* behavior */ = {
+                       isa = PBXGroup;
+                       children = (
+                               EB82A2A41FAFF26900CA64A9 /* SFBehavior.h */,
+                               EB82A2A51FAFF26900CA64A9 /* SFBehavior.m */,
+                       );
+                       path = behavior;
+                       sourceTree = "<group>";
+               };
+               0C8BBE831FC9DA1700580909 /* Octagon Trust */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0CCCC7C720261D050024405E /* OT.h */,
+                               0CCCC7C820261D310024405E /* OT.m */,
+                               EB10A3E320356E2000E84270 /* OTConstants.h */,
+                               EB10A3E420356E2000E84270 /* OTConstants.m */,
+                               DC124DC120059B8700BE8DAC /* OctagonControlServer.h */,
+                               DC124DC220059B8700BE8DAC /* OctagonControlServer.m */,
+                               BEE4B1901FFD604B00777D39 /* OTAuthenticatedCiphertext+SF.h */,
+                               BEE4B1911FFD604B00777D39 /* OTAuthenticatedCiphertext+SF.m */,
+                               0C8BBE951FC9DA5800580909 /* OTBottledPeer.h */,
+                               0C8BBE931FC9DA5700580909 /* OTBottledPeer.m */,
+                               BE2AD2B11FDA07EF00739F96 /* OTBottledPeerRecord.h */,
+                               BE2AD2B21FDA07EF00739F96 /* OTBottledPeerRecord.m */,
+                               0CE1BCCD1FCE11610017230E /* OTBottledPeerSigned.h */,
+                               0CE1BCC61FCE11480017230E /* OTBottledPeerSigned.m */,
+                               0C8BBE891FC9DA5200580909 /* OTCloudStore.h */,
+                               0C770EC31FCF7E2000B5F0E2 /* OTCloudStore.m */,
+                               0CE407B31FD476E000F59B31 /* OTCloudStoreState.h */,
+                               0CE407AB1FD4769B00F59B31 /* OTCloudStoreState.m */,
+                               0C8BBE8B1FC9DA5300580909 /* OTContext.h */,
+                               0C8BBE981FC9DA5A00580909 /* OTContext.m */,
+                               0CD9E8071FE05B8700F66C38 /* OTContextRecord.h */,
+                               0CD9E7FF1FE05B6600F66C38 /* OTContextRecord.m */,
+                               0C8BBF0B1FCB452200580909 /* OTControl.h */,
+                               0C8BBF0E1FCB452400580909 /* OTControl.m */,
+                               0C8BBF0C1FCB452200580909 /* OTControlProtocol.h */,
+                               0C8BBF0D1FCB452300580909 /* OTControlProtocol.m */,
+                               0C8BBE971FC9DA5A00580909 /* OTDefines.h */,
+                               0C8BBE921FC9DA5700580909 /* OTEscrowKeys.h */,
+                               0C8BBE961FC9DA5900580909 /* OTEscrowKeys.m */,
+                               0C8BBE8A1FC9DA5300580909 /* OTIdentity.h */,
+                               0C8BBE8D1FC9DA5400580909 /* OTIdentity.m */,
+                               0C8BBE8E1FC9DA5500580909 /* OTLocalStore.h */,
+                               0C8BBE8C1FC9DA5400580909 /* OTLocalStore.m */,
+                               0C8BBF101FCB486B00580909 /* OTManager.h */,
+                               0C8BBF0F1FCB481800580909 /* OTManager.m */,
+                               0C36B3202007EE9B0029F7A2 /* OTPreflightInfo.h */,
+                               0C36B3172007EE6C0029F7A2 /* OTPreflightInfo.m */,
+                               BEB0B0D91FFC45C2007E6A83 /* OTPrivateKey+SF.h */,
+                               BEB0B0DA1FFC45C2007E6A83 /* OTPrivateKey+SF.m */,
+                               0C5CFB3F201962FF00913B9C /* OTRamping.h */,
+                               0C5CFB37201960FF00913B9C /* OTRamping.m */,
+                               BE34059B1FD71BA700933DAC /* Protocol Buffers */,
+                               BEE4B1971FFDAFE600777D39 /* SFECPublicKey+SPKI.m */,
+                               BEE4B1961FFDAFE600777D39 /* SFPublicKey+SPKI.h */,
+                               0C8BBEB11FC9DCAC00580909 /* tests */,
+                       );
+                       name = "Octagon Trust";
+                       sourceTree = "<group>";
+               };
+               0C8BBEB11FC9DCAC00580909 /* tests */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0C8A034E1FDF60070042E8BE /* OTBottledPeerTests.m */,
+                               0CBDF64C1FFC951200433E0D /* OTBottledPeerTLK.m */,
+                               0C16371F1FD12F1500210823 /* OTCloudStoreTests.m */,
+                               0C8BBEAF1FC9DCA400580909 /* OTContextTests.m */,
+                               0C8A03451FDF42BA0042E8BE /* OTEscrowKeyTests.m */,
+                               0C8A034C1FDF4CCE0042E8BE /* OTLocalStoreTests.m */,
+                               0C46A57A2035019800F17112 /* OTLockStateNetworkingTests.m */,
+                               0CB975502023B199008D6B48 /* OTRampingTests.m */,
+                               0C52C20520004248003F0733 /* OTTestsBase.h */,
+                               0C52C1FE20003BCA003F0733 /* OTTestsBase.m */,
+                       );
+                       name = tests;
+                       sourceTree = "<group>";
+               };
+               0C8BBEF61FCB402900580909 /* otctl */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0C8BBEF71FCB405700580909 /* otctl.m */,
+                               0C8BBEF81FCB407700580909 /* otctl-Entitlements.plist */,
+                       );
+                       path = otctl;
+                       sourceTree = "<group>";
+               };
+               0CF0E2DD1F8EE37C00BD18E4 /* Signin Metrics */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0CF0E2E31F8EE3B000BD18E4 /* SFTransactionMetric.m */,
+                               0CF0E2E71F8EE40700BD18E4 /* SFTransactionMetric.h */,
+                       );
+                       path = "Signin Metrics";
+                       sourceTree = "<group>";
+               };
                107226CF0D91DB32003CF14F /* sectask */ = {
                        isa = PBXGroup;
                        children = (
                4723C9B51F152E8E0082882F /* Analytics */ = {
                        isa = PBXGroup;
                        children = (
+                               6C7BAFFD2006B4D4004D1B6B /* Clients */,
                                4723C9BB1F152E9E0082882F /* SQLite */,
-                               4723C9DA1F1540CE0082882F /* SFAnalyticsLogger.h */,
-                               4723C9DB1F1540CE0082882F /* SFAnalyticsLogger.m */,
-                               475F371F1EE8F23900248FB5 /* SFAnalyticsLogging.plist */,
+                               475F371F1EE8F23900248FB5 /* SFAnalytics.plist */,
+                               4723C9DA1F1540CE0082882F /* SFAnalytics.h */,
+                               6CC952421FB4C5CA0051A823 /* SFAnalytics+Internal.h */,
+                               4723C9DB1F1540CE0082882F /* SFAnalytics.m */,
+                               6CBF65371FA147E500A68667 /* SFAnalyticsActivityTracker.h */,
+                               6C8CE6BB1FA248B50032ADF0 /* SFAnalyticsActivityTracker+Internal.h */,
+                               6CBF65381FA147E500A68667 /* SFAnalyticsActivityTracker.m */,
+                               6C69518F1F75A8C100F68F91 /* SFAnalyticsDefines.h */,
+                               6CDB5FF41FA78CB500410924 /* SFAnalyticsMultiSampler.h */,
+                               6CDB5FED1FA78CB400410924 /* SFAnalyticsMultiSampler.m */,
+                               6CDB5FF31FA78CB500410924 /* SFAnalyticsMultiSampler+Internal.h */,
+                               6CDF8DE51F95562B00140B54 /* SFAnalyticsSampler.h */,
+                               6C8CE6C31FA24A670032ADF0 /* SFAnalyticsSampler+Internal.h */,
+                               6CDF8DE61F95562B00140B54 /* SFAnalyticsSampler.m */,
+                               6C69518E1F75A7DC00F68F91 /* SFAnalyticsSQLiteStore.h */,
+                               6C69518D1F75A7DB00F68F91 /* SFAnalyticsSQLiteStore.m */,
                        );
                        path = Analytics;
                        sourceTree = "<group>";
                        path = SQLite;
                        sourceTree = "<group>";
                };
+               4727FBB81F9918590003AE36 /* secdxctests */ = {
+                       isa = PBXGroup;
+                       children = (
+                               4727FBB91F9918590003AE36 /* KeychainCryptoTests.m */,
+                               4727FBBB1F9918590003AE36 /* Info.plist */,
+                               477A1FE1203763A500ACD81D /* KeychainAPITests.m */,
+                               477A1FEB2037A0E000ACD81D /* KeychainXCTest.h */,
+                               477A1FEC2037A0E000ACD81D /* KeychainXCTest.m */,
+                       );
+                       path = secdxctests;
+                       sourceTree = "<group>";
+               };
                47702B1F1E5F409700B29577 /* seckeychainnetworkextensionsystemdaemontest */ = {
                        isa = PBXGroup;
                        children = (
                        path = SecurityUnitTests;
                        sourceTree = "<group>";
                };
+               47D1837D1FB1183D00CFCD89 /* SecDbKeychainV7-protobufs */ = {
+                       isa = PBXGroup;
+                       children = (
+                               47922D4E1FAA7D5C0008F7E0 /* SecDbKeychainSerializedItemV7.proto */,
+                               47922D501FAA7DF60008F7E0 /* SecDbKeychainSerializedItemV7.h */,
+                               47922D511FAA7DF70008F7E0 /* SecDbKeychainSerializedItemV7.m */,
+                               47922D171FAA65120008F7E0 /* SecDbKeychainAKSSerializedWrappedKey.proto */,
+                               47922D371FAA7C040008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.h */,
+                               47922D361FAA7C030008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.m */,
+                               47922D201FAA75FF0008F7E0 /* SecDbKeychainSerializedMetadata.proto */,
+                               47922D3B1FAA7C100008F7E0 /* SecDbKeychainSerializedMetadata.h */,
+                               47922D3A1FAA7C0F0008F7E0 /* SecDbKeychainSerializedMetadata.m */,
+                               47922D2C1FAA77970008F7E0 /* SecDbKeychainSerializedSecretData.proto */,
+                               47922D3E1FAA7C1A0008F7E0 /* SecDbKeychainSerializedSecretData.h */,
+                               47922D3F1FAA7C1B0008F7E0 /* SecDbKeychainSerializedSecretData.m */,
+                       );
+                       path = "SecDbKeychainV7-protobufs";
+                       sourceTree = "<group>";
+               };
                4814D86C1CAA064F002FFC36 /* os_log */ = {
                        isa = PBXGroup;
                        children = (
                        isa = PBXGroup;
                        children = (
                                53C0E1F1177FAC2C00F8A018 /* CloudKeychain.strings */,
+                               D4C263C81F952E64001317EA /* SecDebugErrorMessages.strings */,
+                               D4C263CC1F952F6C001317EA /* SecErrorMessages.strings */,
                                BE4AC9B818B8273600B84964 /* SharedWebCredentials.strings */,
                                4C198F1F0ACDB4BF00AAB142 /* OID.strings */,
                                4C198F1D0ACDB4BF00AAB142 /* Certificate.strings */,
+                               D479F6DF1F980F8F00388D28 /* Trust.strings */,
                        );
                        name = strings;
                        path = ../../../resources;
                                DCE4E8A01D7F352600AFB96E /* authd */,
                                DCE4E85A1D7A583100AFB96E /* trustd */,
                                DC5AC1FF1D83650C00CF422C /* securityd */,
+                               6C69517B1F758E1000F68F91 /* supd */,
                                DC0BC4E51D8B6AA600070CB0 /* applications */,
                                DC5AC2011D83663C00CF422C /* tests */,
                                EB2CA5311D2C30CD00AB770F /* xcconfig */,
                                4C4CE9120AF81F0E0056B01D /* README */,
                                4CAB97FD1114CC5300EFB38D /* README.keychain */,
                                4C4CE9070AF81ED80056B01D /* TODO */,
+                               0CE98BAD1FA93AA900CF1D54 /* CKKSTests-Info.plist */,
+                               0C85E0041FB38BB7000343A7 /* OTTests-Info.plist */,
                        );
                        sourceTree = "<group>";
                };
                                4C711D7613AFCD0900FE865D /* SecurityDevTests.app */,
                                E7B01BF2166594AB000485F1 /* SyncDevTest2.app */,
                                52D82BDE16A621F70078DFE5 /* CloudKeychainProxy.bundle */,
-                               728B56A116D59979008FA3AB /* OTAPKIAssetTool */,
                                4C52D0B416EFC61E0079966E /* CircleJoinRequested */,
                                5346480117331E1200FE9172 /* KeychainSyncAccountNotification.bundle */,
                                0C0BDB2F175685B000BC1A7E /* secdtests */,
                                EBCF73FC1CE45F9C00BED7CA /* secitemfunctionality */,
                                0C2BCBB91D06401F00ED7A2F /* dtlsEchoClient */,
                                0C2BCBCE1D0648D100ED7A2F /* dtlsEchoServer */,
-                               DC1785051D77873100B50D50 /* Security.framework */,
                                DC1789041D77980500B50D50 /* Security.framework */,
                                DC58C4231D77BDEA003C25A4 /* csparser.bundle */,
                                DC610A341D78F129002223DE /* secdtests */,
                                DCD06A511D8CE281007602F1 /* libcodehost.a */,
                                DCD06A741D8CE2D5007602F1 /* gkunpack */,
                                DCD06AB01D8E0D53007602F1 /* libsecurity_utilities.a */,
-                               DC59E9EC1D91C9DC001BDDF5 /* libDER_not_installed.a */,
-                               DC59EA251D91CA15001BDDF5 /* libDERUtils.a */,
-                               DC59EA371D91CA82001BDDF5 /* parseCert */,
-                               DC59EA601D91CAF0001BDDF5 /* parseCrl */,
-                               DC59EA701D91CB9F001BDDF5 /* parseTicket */,
                                DC3A4B581D91E9FB00E46D4A /* com.apple.CodeSigningHelper.xpc */,
                                DC71D9DF1D95BA6C0065FB93 /* libASN1.a */,
-                               DC71D9FB1D95BB0A0065FB93 /* libDER.a */,
                                EBF374721DC055580065D840 /* security-sysdiagnose */,
                                DA30D6761DF8C8FB00EC6B43 /* KeychainSyncAccountUpdater.bundle */,
                                DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */,
                                BED208DD1EDF950E00753952 /* manifeststresstest */,
                                47C51B841EEA657D0032D9E5 /* SecurityUnitTests.xctest */,
                                EB2D54AA1F02A45E00E46890 /* secatomicfile */,
+                               4727FBB71F9918580003AE36 /* secdxctests_ios.xctest */,
+                               0C85E0031FB38BB6000343A7 /* OTTests.xctest */,
+                               6C9AA79E1F7C1D8F00D08296 /* supdctl */,
+                               6CAA8D201F842FB3007B6E03 /* securityuploadd */,
+                               6C4605B81F882B9B001421B6 /* KeychainAnalyticsTests.xctest */,
+                               0C8BBF081FCB446400580909 /* otctl */,
+                               478D429C1FD72A8100CAB645 /* secdxctests_mac.xctest */,
+                               EB49B2AE202D877F003F34A0 /* secdmockaks.xctest */,
                        );
                        name = Products;
                        sourceTree = "<group>";
                                4C4296300BB0A68200491999 /* SecTrustSettings.h */,
                                4C12828C0BB4957D00985BB0 /* SecTrustSettingsPriv.h */,
                                4C64E00B0B8FBBF3009B306C /* Security.h */,
+                               EB5E3BC62003C66300F1631B /* SecSignpost.h */,
+                               D46246A21F9AE49E00D63882 /* oids.h */,
                        );
                        name = Security;
                        sourceTree = SOURCE_ROOT;
                                E78A9AD91D34959200006B5B /* NSFileHandle+Formatting.m */,
                                4C4CB7100DDA44900026B660 /* entitlements.plist */,
                                E7104A0B169E171900DB0045 /* security_tool_commands.c */,
+                               D453C47F1FFD857400DE349B /* security_tool_commands.h */,
                                E7FEFB80169E26E200E18152 /* sub_commands.h */,
                        );
                        name = "Security2Tool macOS";
                                6C34464E1E2534D200F9522B /* AWD */,
                                EBB407AF1EBA433A00A541A5 /* CKKSPowerCollection.h */,
                                EBB407B01EBA433A00A541A5 /* CKKSPowerCollection.m */,
-                               479108B51EE879F9008CEFA0 /* CKKSAnalyticsLogger.h */,
-                               479108B61EE879F9008CEFA0 /* CKKSAnalyticsLogger.m */,
+                               479108B51EE879F9008CEFA0 /* CKKSAnalytics.h */,
+                               479108B61EE879F9008CEFA0 /* CKKSAnalytics.m */,
                        );
                        name = Analytics;
                        sourceTree = "<group>";
                        name = AWD;
                        sourceTree = "<group>";
                };
+               6C69517B1F758E1000F68F91 /* supd */ = {
+                       isa = PBXGroup;
+                       children = (
+                               6C758CAF1F8826100075BD78 /* Tests */,
+                               6C69517C1F758E1000F68F91 /* supdProtocol.h */,
+                               6C69517D1F758E1000F68F91 /* supd.h */,
+                               6C69517E1F758E1000F68F91 /* supd.m */,
+                               6C6951801F758E1000F68F91 /* main.m */,
+                               6C6951821F758E1000F68F91 /* Info.plist */,
+                               6C1260FA1F7D631D001B2EEC /* securityuploadd-ios.plist */,
+                               6C1260F21F7D5F25001B2EEC /* securityuploadd-osx.plist */,
+                               6C5B10211F9164F5009B091E /* securityuploadd.8 */,
+                               6CDB600E1FA92C1700410924 /* securityuploadd-Entitlements.plist */,
+                       );
+                       path = supd;
+                       sourceTree = "<group>";
+               };
+               6C758CAF1F8826100075BD78 /* Tests */ = {
+                       isa = PBXGroup;
+                       children = (
+                               6C1A29FC1F882788002312D8 /* SFAnalyticsTests.m */,
+                               6C758CB01F8826100075BD78 /* SupdTests.m */,
+                               6C758CB21F8826100075BD78 /* Info.plist */,
+                       );
+                       path = Tests;
+                       sourceTree = "<group>";
+               };
+               6C7BAFFD2006B4D4004D1B6B /* Clients */ = {
+                       isa = PBXGroup;
+                       children = (
+                               6C7BB0042006B4EF004D1B6B /* SOSAnalytics.h */,
+                               6C7BB0032006B4EE004D1B6B /* SOSAnalytics.m */,
+                       );
+                       path = Clients;
+                       sourceTree = "<group>";
+               };
+               6C9AA79F1F7C1D9000D08296 /* supdctl */ = {
+                       isa = PBXGroup;
+                       children = (
+                               6C9AA7A01F7C1D9000D08296 /* main.m */,
+                               6C5B101B1F91613E009B091E /* supdctl-Entitlements.plist */,
+                       );
+                       path = supdctl;
+                       sourceTree = "<group>";
+               };
                6CB5F4771E402D6D00DBF3F0 /* testrunner */ = {
                        isa = PBXGroup;
                        children = (
                        name = "Supporting Files";
                        sourceTree = "<group>";
                };
-               728B56A316D59979008FA3AB /* OTAPKIAssetTool */ = {
-                       isa = PBXGroup;
-                       children = (
-                               72CD2BBB16D59AE30064EEE1 /* OTAServiceApp.m */,
-                               72CD2BBC16D59AE30064EEE1 /* OTAServiceApp.h */,
-                               72CD2BBD16D59AE30064EEE1 /* OTAServicemain.m */,
-                               728B56A416D59979008FA3AB /* Supporting Files */,
-                       );
-                       path = OTAPKIAssetTool;
-                       sourceTree = "<group>";
-               };
-               728B56A416D59979008FA3AB /* Supporting Files */ = {
-                       isa = PBXGroup;
-                       children = (
-                               5DDD0BDD16D6740E00D6C0D6 /* com.apple.OTAPKIAssetTool.plist */,
-                               5DDD0BDE16D6740E00D6C0D6 /* OTAPKIAssetTool-entitlements.plist */,
-                               22C002A31AC9D33100B3469E /* OTAPKIAssetTool.xcconfig */,
-                       );
-                       name = "Supporting Files";
-                       sourceTree = "<group>";
-               };
                7908507E0CA87CF00083CC4D /* ipc */ = {
                        isa = PBXGroup;
                        children = (
                        name = "Supporting Files";
                        sourceTree = "<group>";
                };
+               BE34059B1FD71BA700933DAC /* Protocol Buffers */ = {
+                       isa = PBXGroup;
+                       children = (
+                               BE3405A11FD71CC800933DAC /* OTBottle.proto */,
+                               BE3405A51FD720C900933DAC /* OTBottleContents.proto */,
+                               BEB0B0CE1FFC37E3007E6A83 /* OTPrivateKey.proto */,
+                               BEE4B1861FFD57D800777D39 /* OTAuthenticatedCiphertext.proto */,
+                               BE3405A21FD71CDE00933DAC /* derived source */,
+                       );
+                       name = "Protocol Buffers";
+                       path = ot/proto;
+                       sourceTree = "<group>";
+               };
+               BE3405A21FD71CDE00933DAC /* derived source */ = {
+                       isa = PBXGroup;
+                       children = (
+                               BE3405A41FD71DA600933DAC /* OTBottle.h */,
+                               BE3405A31FD71DA400933DAC /* OTBottle.m */,
+                               BE3405A61FD7210200933DAC /* OTBottleContents.h */,
+                               BE3405A71FD7210300933DAC /* OTBottleContents.m */,
+                               BEB0B0D51FFC3D33007E6A83 /* OTPrivateKey.h */,
+                               BEB0B0D41FFC3D32007E6A83 /* OTPrivateKey.m */,
+                               BEE4B18E1FFD5F9000777D39 /* OTAuthenticatedCiphertext.h */,
+                               BEE4B18F1FFD5F9100777D39 /* OTAuthenticatedCiphertext.m */,
+                       );
+                       name = "derived source";
+                       path = source;
+                       sourceTree = "<group>";
+               };
                BED208E31EDF95BB00753952 /* manifeststresstest */ = {
                        isa = PBXGroup;
                        children = (
                                F621D0801ED6EA4C000EA569 /* authorizationdump */,
                                DC58C4391D77BEA1003C25A4 /* csparser */,
                                5E10992719A5E55800A60E2B /* ISACLProtectedItems */,
-                               728B56A316D59979008FA3AB /* OTAPKIAssetTool */,
                                DC5AC1FE1D8364BA00CF422C /* SecurityTool */,
                                DCC78EA21D80860C00865A7C /* SharedWebCredentialAgent */,
                                BE197F2719116FD100BA91D1 /* SharedWebCredentialViewService */,
                                DC0BC5361D8B6ABE00070CB0 /* XPCKeychainSandboxCheck */,
                                DC0BC56E1D8B6E6400070CB0 /* XPCTimeStampingService */,
+                               6C9AA79F1F7C1D9000D08296 /* supdctl */,
                        );
                        name = applications;
                        sourceTree = "<group>";
                                DC0BC6131D8B755200070CB0 /* ckutilities.c */,
                                DC0BC6141D8B755200070CB0 /* ckutilities.h */,
                                DC0BC6151D8B755200070CB0 /* Crypt.h */,
-                               DC0BC6161D8B755200070CB0 /* CryptKitSA.h */,
-                               DC0BC6171D8B755200070CB0 /* CryptKit.h */,
                                DC0BC6181D8B755200070CB0 /* CryptKitAsn1.cpp */,
                                DC0BC6191D8B755200070CB0 /* CryptKitAsn1.h */,
                                DC0BC61A1D8B755200070CB0 /* CryptKitDER.cpp */,
                                DCC78E451D8085FC00865A7C /* SecCTKKeyPriv.h */,
                                DCC78E381D8085FC00865A7C /* SecCertificate.c */,
                                4CEF4CA70C5551FE00062475 /* SecCertificateInternal.h */,
-                               DCC78E3B1D8085FC00865A7C /* SecCertificatePath.c */,
-                               4CF41D0A0BBB4022005F3248 /* SecCertificatePath.h */,
                                DCC78E3E1D8085FC00865A7C /* SecCertificateRequest.c */,
                                DCC78E461D8085FC00865A7C /* SecDH.c */,
                                7940D4110C3ACF9000FDB5D8 /* SecDH.h */,
                                DCC78E7A1D8085FC00865A7C /* SecPasswordGenerate.c */,
                                CDDE9BC31729AB910013B0E8 /* SecPasswordGenerate.h */,
                                DCC78E7E1D8085FC00865A7C /* SecPolicy.c */,
+                               D43DDE581F638061009742A5 /* SecPolicy.list */,
+                               D43DDE511F620F09009742A5 /* SecPolicyChecks.list */,
                                DCC78E811D8085FC00865A7C /* SecPolicyCerts.h */,
                                4CFBF5F10D5A92E100969BBE /* SecPolicyInternal.h */,
                                DCC78E7F1D8085FC00865A7C /* SecPolicyLeafCallbacks.c */,
                                EB6928BF1D9C9C5900062A18 /* SecRecoveryKey.m */,
                                DCC78E9A1D8085FC00865A7C /* SecuritydXPC.c */,
                                DCC78E9B1D8085FC00865A7C /* SecuritydXPC.h */,
+                               D462469C1F9AE45900D63882 /* oids.c */,
                                DCC78E2A1D8085FC00865A7C /* p12import.c */,
                                79EF5B720D3D6AFE009F5270 /* p12import.h */,
                                DCC78E2C1D8085FC00865A7C /* p12pbegen.c */,
                                8E02FA691107BE460043545E /* pbkdf2.h */,
                                DCC78E9C1D8085FC00865A7C /* vmdh.c */,
                                4C7391770B01745000C4CBFA /* vmdh.h */,
+                               47A05B101FDB5A8B00D0816E /* SFKeychainControl.h */,
                        );
                        name = src;
                        sourceTree = "<group>";
                                DC1789A81D77A06800B50D50 /* Resources */,
                                DC1789A41D779E3B00B50D50 /* dummy.cpp */,
                                DC24B5801DA3286D00330B48 /* Security.order */,
+                               DCB332361F467CC200178C30 /* macos_tapi_hacks.h */,
                        );
                        name = "Security.framework macOS";
                        sourceTree = "<group>";
                        isa = PBXGroup;
                        children = (
                                DC178A311D77A1F500B50D50 /* FDEPrefs.plist */,
+                               D4C263C51F8FF2A9001317EA /* generateErrStrings.pl */,
                                DC178A321D77A1F500B50D50 /* SecDebugErrorMessages.strings */,
                                DC178A331D77A1F500B50D50 /* SecErrorMessages.strings */,
                                DC178A351D77A1F500B50D50 /* framework.sb */,
                DC3502B61E0208BE00BC0587 /* Tests (Local) */ = {
                        isa = PBXGroup;
                        children = (
+                               DAEE05551FAD3FC500DF27F3 /* AutoreleaseTest.c */,
+                               DAEE055B1FAD3FC600DF27F3 /* AutoreleaseTest.h */,
                                471024D91E79CB6D00844C09 /* CKKSTests.h */,
                                DC3502B71E0208BE00BC0587 /* CKKSTests.m */,
+                               0CA4EBF1202B8D1C002B1D96 /* CloudKitKeychainSyncingTestsBase.h */,
+                               0CA4EBF2202B8D1D002B1D96 /* CloudKitKeychainSyncingTestsBase.m */,
                                DC6593D21ED8DBCE00C19462 /* CKKSTests+API.h */,
                                DC15F79B1E68EAD5003B9A40 /* CKKSTests+API.m */,
                                DC6593C91ED8DA9200C19462 /* CKKSTests+CurrentPointerAPI.m */,
                                DC9A2C5E1EB3F556008FAC27 /* CKKSTests+Coalesce.m */,
+                               DCFABF8D20081E2F001128B5 /* CKKSDeviceStateUploadTests.m */,
+                               DCAD9B481F8D95F200C5E2AE /* CloudKitKeychainSyncingFixupTests.m */,
+                               DCBF2F7C1F90084D00ED0CA4 /* CKKSTLKSharingTests.m */,
                                DC08D1CB1E64FCC5006237DA /* CKKSSOSTests.m */,
                                DC9C750F1E4BCC5100F1CA0D /* CKKSOperationTests.m */,
                                DC222C891E089BAE00B09171 /* CKKSSQLTests.m */,
-                               DC4DB15E1E2590B100CD6769 /* CKKSEncryptionTests.m */,
+                               DC4DB15E1E2590B100CD6769 /* CKKSAESSIVEncryptionTests.m */,
+                               DC7341FD1F84642C00AB9BDF /* CKKSTLKSharingEncryptionTests.m */,
                                6C34462F1E24F6BE00F9522B /* CKKSRateLimiterTests.m */,
                                DCD6C4B61EC5319600414FEE /* CKKSNearFutureSchedulerTests.m */,
                                DCFE1C3C1F17EFB5007640C8 /* CKKSConditionTests.m */,
                                6C588D791EAA149F00D7E322 /* RateLimiterTests.m */,
                                4723C9D11F1531970082882F /* CKKSLoggerTests.m */,
                                DCE7F2081F21726500DDB0F7 /* CKKSAPSReceiverTests.m */,
+                               DC9C95951F748D0B000D19E5 /* CKKSServerValidationRecoveryTests.m */,
                        );
                        name = "Tests (Local)";
                        path = tests;
                                DC52EA981D80CC2A00B0A59C /* SecurityTool.c */,
                                DC52EA991D80CC2A00B0A59C /* SecurityTool.h */,
                                DC52EA9A1D80CC2A00B0A59C /* tool_errors.h */,
+                               473337821FDB29A200E19F30 /* KeychainCheck.h */,
+                               473337831FDB29A200E19F30 /* KeychainCheck.m */,
                        );
                        name = "SecurityTool iOS";
                        path = OSX/sec/SecurityTool;
                                DCD067621D8CDE9B007602F1 /* codesigning */,
                                DCD06AA81D8E0D3D007602F1 /* security_utilities */,
                                E7450BB216D42BD4009C07B8 /* Headers */,
-                               DC59E9AB1D91C9CE001BDDF5 /* DER */,
                                DC8834001D8A217200CE0ACA /* ASN1 */,
                                DC0BCC371D8C689C00070CB0 /* utilities */,
                                DCC0800D1CFF7903005C35C8 /* CSSMOID.exp-in */,
                                4CB7405F0A47498100D641BB /* Security.exp-in */,
+                               EBD8AD632004B45500588BBA /* SecurityCustomSignposts.plist */,
                        );
                        name = "Security.framework (Shared)";
                        sourceTree = "<group>";
                };
-               DC59E9AB1D91C9CE001BDDF5 /* DER */ = {
-                       isa = PBXGroup;
-                       children = (
-                               DC59E9FD1D91CA0A001BDDF5 /* libDER */,
-                               DC59EA2C1D91CA2C001BDDF5 /* libDERUtils */,
-                       );
-                       name = DER;
-                       sourceTree = "<group>";
-               };
-               DC59E9FD1D91CA0A001BDDF5 /* libDER */ = {
-                       isa = PBXGroup;
-                       children = (
-                               DC3832C01DB6E69800385F63 /* module.modulemap */,
-                               DC59E9ED1D91CA0A001BDDF5 /* DER_Keys.c */,
-                               DC59E9EE1D91CA0A001BDDF5 /* DER_Keys.h */,
-                               DC59E9EF1D91CA0A001BDDF5 /* asn1Types.h */,
-                               DC59E9F01D91CA0A001BDDF5 /* DER_CertCrl.c */,
-                               DC59E9F11D91CA0A001BDDF5 /* DER_CertCrl.h */,
-                               DC59E9F21D91CA0A001BDDF5 /* DER_Decode.c */,
-                               DC59E9F31D91CA0A001BDDF5 /* DER_Decode.h */,
-                               DC59E9F41D91CA0A001BDDF5 /* DER_Encode.c */,
-                               DC59E9F51D91CA0A001BDDF5 /* DER_Encode.h */,
-                               DC59E9F61D91CA0A001BDDF5 /* libDER_config.h */,
-                               DC59E9F71D91CA0A001BDDF5 /* libDER.h */,
-                               DC59E9F81D91CA0A001BDDF5 /* DER_Digest.h */,
-                               DC59E9F91D91CA0A001BDDF5 /* DER_Digest.c */,
-                               DC59E9FA1D91CA0A001BDDF5 /* oids.c */,
-                               DC1785421D778A7400B50D50 /* oids.h */,
-                               DC59E9FC1D91CA0A001BDDF5 /* oidsPriv.h */,
-                       );
-                       name = libDER;
-                       path = OSX/libsecurity_keychain/libDER/libDER;
-                       sourceTree = "<group>";
-               };
-               DC59EA2C1D91CA2C001BDDF5 /* libDERUtils */ = {
-                       isa = PBXGroup;
-                       children = (
-                               DC59EA261D91CA2C001BDDF5 /* libDERUtils.h */,
-                               DC59EA271D91CA2C001BDDF5 /* libDERUtils.c */,
-                               DC59EA281D91CA2C001BDDF5 /* fileIo.c */,
-                               DC59EA291D91CA2C001BDDF5 /* fileIo.h */,
-                               DC59EA2A1D91CA2C001BDDF5 /* printFields.h */,
-                               DC59EA2B1D91CA2C001BDDF5 /* printFields.c */,
-                       );
-                       name = libDERUtils;
-                       path = OSX/libsecurity_keychain/libDER/libDERUtils;
-                       sourceTree = "<group>";
-               };
-               DC59EA4B1D91CACE001BDDF5 /* libDER */ = {
-                       isa = PBXGroup;
-                       children = (
-                               DC59EA451D91CACE001BDDF5 /* AppleMobilePersonalizedTicket.h */,
-                               DC59EA461D91CACE001BDDF5 /* DER_Ticket.c */,
-                               DC59EA471D91CACE001BDDF5 /* DER_Ticket.h */,
-                               DC59EA481D91CACE001BDDF5 /* parseTicket.c */,
-                               DC59EA491D91CACE001BDDF5 /* parseCert.c */,
-                               DC59EA4A1D91CACE001BDDF5 /* parseCrl.c */,
-                       );
-                       name = libDER;
-                       path = OSX/libsecurity_keychain/libDER/Tests;
-                       sourceTree = "<group>";
-               };
                DC5ABD281D832D4C00CF422C /* SecurityTool macOS */ = {
                        isa = PBXGroup;
                        children = (
                                F667EC541E96E8C800203D5C /* authdtests */,
                                EB1055641E14DB370003C309 /* secfuzzer */,
                                DC0BCBD81D8C646700070CB0 /* regressionBase */,
-                               DC59EA4B1D91CACE001BDDF5 /* libDER */,
                                DC0BCCB81D8C68F000070CB0 /* utilitiesRegressions */,
                                DC0BC5CD1D8B72FE00070CB0 /* test-checkpw */,
                                DC610AB81D7910E5002223DE /* gk_reset_check */,
                                EB9C1DAA1BDFD0FE00F89272 /* RegressionTests */,
                                4CE5A55609C7970A00D27A3F /* sslViewer */,
                                0C2BCBA41D063F7D00ED7A2F /* dtlsEcho */,
+                               4727FBB81F9918590003AE36 /* secdxctests */,
+                               EB49B2AF202D8780003F34A0 /* secdmockaks */,
                        );
                        name = tests;
                        sourceTree = "<group>";
                DC6D2C941DD3B20400BE372D /* keychain */ = {
                        isa = PBXGroup;
                        children = (
+                               0C7CEA391FE9CE3900125C79 /* behavior */,
+                               0C8BBEF61FCB402900580909 /* otctl */,
+                               0C8BBE831FC9DA1700580909 /* Octagon Trust */,
+                               0CF0E2DD1F8EE37C00BD18E4 /* Signin Metrics */,
                                EB27FF051E402C3C00EC9E3A /* ckksctl */,
                                6C34464D1E2534C200F9522B /* Analytics */,
                                BEF88C451EAFFFED00357577 /* TrustedPeers */,
                DC9B7AD31DCBF336004E9385 /* CloudKit Syncing */ = {
                        isa = PBXGroup;
                        children = (
+                               DC9FD3161F857FF800C8AAC8 /* Protocol Buffers */,
                                DCD662F21E3294DE00188186 /* CloudKit Support */,
                                DCFE1C311F17ECC3007640C8 /* dispatch Support */,
                                DCD662EB1E32946000188186 /* Sync Objects */,
                                DCBDB3BA1E57CA7A00B61300 /* CKKSViewManager.m */,
                                DCBDB3B01E57C67500B61300 /* CKKSKeychainView.h */,
                                DCBDB3B11E57C67500B61300 /* CKKSKeychainView.m */,
+                               DC9FD3281F8598F300C8AAC8 /* CKKSPeer.h */,
+                               DC9FD3291F8598F300C8AAC8 /* CKKSPeer.m */,
                                DC1ED8C01DD51890002BDCFA /* CKKSItemEncrypter.h */,
                                DC1ED8BA1DD51883002BDCFA /* CKKSItemEncrypter.m */,
                                6CC185971E24E87D009657D8 /* CKKSRateLimiter.h */,
                                6CC185981E24E87D009657D8 /* CKKSRateLimiter.m */,
                                6CA2B9431E9F9F5700C43444 /* RateLimiter.h */,
                                6CC7F5B31E9F99EE0014AE63 /* RateLimiter.m */,
+                               DC9C95B21F79CFD1000D19E5 /* CKKSControl.h */,
+                               DC9C95B31F79CFD1000D19E5 /* CKKSControl.m */,
+                               DA6AA1641FE88AFA004565B0 /* CKKSControlServer.h */,
+                               DA6AA15E1FE88AF9004565B0 /* CKKSControlServer.m */,
                        );
                        name = "CloudKit Syncing";
                        path = ckks;
                        sourceTree = "<group>";
                };
+               DC9FD3161F857FF800C8AAC8 /* Protocol Buffers */ = {
+                       isa = PBXGroup;
+                       children = (
+                               DC9FD3251F858BAD00C8AAC8 /* derived source */,
+                               DC4D49D81F857728007AF2B8 /* CKKSSerializedKey.proto */,
+                       );
+                       name = "Protocol Buffers";
+                       path = proto;
+                       sourceTree = "<group>";
+               };
+               DC9FD3251F858BAD00C8AAC8 /* derived source */ = {
+                       isa = PBXGroup;
+                       children = (
+                               DC9FD3271F858D3F00C8AAC8 /* CKKSSerializedKey.h */,
+                               DC9FD3261F858D3E00C8AAC8 /* CKKSSerializedKey.m */,
+                       );
+                       name = "derived source";
+                       path = source;
+                       sourceTree = "<group>";
+               };
                DCA4D2121E5651950056214F /* Tests (Live CloudKit) */ = {
                        isa = PBXGroup;
                        children = (
                DCA4D2191E569FFE0056214F /* Helpers */ = {
                        isa = PBXGroup;
                        children = (
+                               EB4E0CD41FF36A1900CDCACC /* CKKSReachabilityTracker.h */,
+                               EB4E0CD51FF36A1900CDCACC /* CKKSReachabilityTracker.m */,
                                DC207EB61ED4EAB600D46873 /* CKKSLockStateTracker.h */,
                                DC207EB71ED4EAB600D46873 /* CKKSLockStateTracker.m */,
                                DCCD88E61E42622200F5AA71 /* CKKSGroupOperation.h */,
                                DCCD88E71E42622200F5AA71 /* CKKSGroupOperation.m */,
+                               DC1447881F5764C600236DB4 /* CKKSResultOperation.h */,
+                               DC1447891F5764C600236DB4 /* CKKSResultOperation.m */,
+                               DC1447941F5766D200236DB4 /* NSOperationCategories.h */,
+                               DC1447951F5766D200236DB4 /* NSOperationCategories.m */,
                        );
                        name = Helpers;
                        sourceTree = "<group>";
                                DCB342D21D8A32A20054D16E /* UnlockReferralItem.h */,
                                DCB342D31D8A32A20054D16E /* TrustSettingsUtils.cpp */,
                                DCB342D41D8A32A20054D16E /* TrustSettingsUtils.h */,
-                               DCB342D51D8A32A20054D16E /* SecCertificatePrivP.h */,
-                               DCB342D61D8A32A20054D16E /* SecBase64P.c */,
-                               DCB342D71D8A32A20054D16E /* SecFrameworkP.c */,
-                               DCB342D81D8A32A20054D16E /* SecCertificateP.c */,
-                               DCB342D91D8A32A20054D16E /* SecCertificateP.h */,
-                               DCB342DA1D8A32A20054D16E /* SecCertificateInternalP.h */,
                                DCB342DB1D8A32A20054D16E /* generateErrStrings.pl */,
                                DCB342DC1D8A32A20054D16E /* tsaDERUtilities.c */,
                                DCB342DD1D8A32A20054D16E /* tsaDERUtilities.h */,
                                7281E08E1DFD0D810021E1B7 /* secd-210-keyinterest.m */,
                                522B28081E64B48E002B5638 /* secd-230-keybagtable.m */,
                                DCFAEDD11D9998DD005187E4 /* secd-668-ghosts.m */,
+                               0C5F4FD71F952FEA00AF1616 /* secd-700-sftm.m */,
                                DCC78C791D8085D800865A7C /* SOSAccountTesting.h */,
                                DCC78C7A1D8085D800865A7C /* SecdTestKeychainUtilities.c */,
                                DCC78C7B1D8085D800865A7C /* SecdTestKeychainUtilities.h */,
                                DCC78C811D8085D800865A7C /* entitlements.plist */,
                                DCC78C8E1D8085D800865A7C /* SecDbItem.c */,
                                DCC78C8F1D8085D800865A7C /* SecDbItem.h */,
-                               DCC78C901D8085D800865A7C /* SecDbKeychainItem.c */,
+                               DCC78C901D8085D800865A7C /* SecDbKeychainItem.m */,
                                DCC78C911D8085D800865A7C /* SecDbKeychainItem.h */,
                                DCC78C921D8085D800865A7C /* SecDbQuery.c */,
                                DCC78C931D8085D800865A7C /* SecDbQuery.h */,
                                EBC15B1B1DB4306C00126882 /* com.apple.secd.sb */,
                                526965CB1E6E283100627F9D /* AsymKeybagBackup.h */,
                                526965CC1E6E283100627F9D /* AsymKeybagBackup.m */,
+                               470ACEF21F58C3A600D1D5BD /* SecDbKeychainItemV7.h */,
+                               470ACEF31F58C3A600D1D5BD /* SecDbKeychainItemV7.m */,
+                               47D1837D1FB1183D00CFCD89 /* SecDbKeychainV7-protobufs */,
+                               473337771FDAFBCC00E19F30 /* SFKeychainControlManager.h */,
+                               473337781FDAFBCC00E19F30 /* SFKeychainControlManager.m */,
                        );
                        name = "securityd iOS";
                        path = OSX/sec/securityd;
                                DCC78D891D8085F200865A7C /* SOSCloudCircle.m */,
                                DCC78D8A1D8085F200865A7C /* SOSCloudCircle.h */,
                                DCC78D8B1D8085F200865A7C /* SOSCloudCircleInternal.h */,
+                               DCB332371F46804000178C30 /* SOSSysdiagnose.h */,
                                DCC78D8C1D8085F200865A7C /* SOSSysdiagnose.m */,
                                DCC78D8D1D8085F200865A7C /* SOSInternal.m */,
                                DCC78D8E1D8085F200865A7C /* SOSInternal.h */,
                                DCC78D901D8085F200865A7C /* SOSPlatform.h */,
                                EBEEEE351EA31A8300E15F5C /* SOSControlHelper.h */,
                                EBEEEE361EA31A8300E15F5C /* SOSControlHelper.m */,
+                               DAB27ADA1FA29EB700DEBBDE /* SOSControlServer.h */,
+                               DAB27AE01FA29EB800DEBBDE /* SOSControlServer.m */,
                        );
                        path = SecureObjectSync;
                        sourceTree = "<group>";
                                DCC78DD81D8085FC00865A7C /* si-60-cms.c */,
                                DCC78DD91D8085FC00865A7C /* si-61-pkcs12.c */,
                                D48F029B1EA1671B00ACC3C9 /* si-61-pkcs12.h */,
-                               DCC78DDA1D8085FC00865A7C /* si-62-csr.c */,
+                               DCC78DDA1D8085FC00865A7C /* si-62-csr.m */,
                                DCC78DDD1D8085FC00865A7C /* si-63-scep */,
-                               DCC78DDE1D8085FC00865A7C /* si-63-scep.c */,
+                               DCC78DDE1D8085FC00865A7C /* si-63-scep.m */,
                                DCC78DDF1D8085FC00865A7C /* si-63-scep.h */,
                                DCC78DE61D8085FC00865A7C /* si-64-ossl-cms */,
                                DCC78DE71D8085FC00865A7C /* si-64-ossl-cms.c */,
                                DCC78E081D8085FC00865A7C /* si-85-sectrust-ssl-policy.h */,
                                DCC78E091D8085FC00865A7C /* si-87-sectrust-name-constraints.m */,
                                DCC78E0A1D8085FC00865A7C /* si-87-sectrust-name-constraints.h */,
-                               DCC78E0B1D8085FC00865A7C /* si-89-cms-hash-agility.c */,
+                               BEB9E9E51FFF193D00676593 /* si-88-sectrust-valid.m */,
+                               DCC78E0B1D8085FC00865A7C /* si-89-cms-hash-agility.m */,
                                DCC78E0C1D8085FC00865A7C /* si-89-cms-hash-agility.h */,
                                DCC78E0D1D8085FC00865A7C /* si-90-emcs.m */,
                                DCC78E0E1D8085FC00865A7C /* si-95-cms-basic.c */,
                                DCC78E231D8085FC00865A7C /* scep.c */,
                                DCC78E241D8085FC00865A7C /* SecurityCommands.h */,
                                DCC78E251D8085FC00865A7C /* show_certificates.c */,
+                               D453C38A1FEC669300DE349B /* trust_update.m */,
                                DCC78E261D8085FC00865A7C /* spc.c */,
                        );
                        name = Security/Tool;
                                79BDD3940D60D5F9000D84D3 /* libCMS.xcodeproj */,
                                DCC78E321D8085FC00865A7C /* SecAccessControlExports.exp-in */,
                                DCC78E4E1D8085FC00865A7C /* SecExports.exp-in */,
+                               DCD7EE9B1F4F51D9007D9804 /* ios_tapi_hacks.h */,
                        );
                        name = "Security.framework iOS";
                        path = OSX/sec/Security;
                        children = (
                                DC1787441D7790A500B50D50 /* CSCommonPriv.h */,
                                DC1787451D7790A500B50D50 /* SecAssessment.h */,
-                               DC1787461D7790A500B50D50 /* SecCodeHostLib.h */,
                                DC1787471D7790A500B50D50 /* SecCodePriv.h */,
                                DC1787481D7790A500B50D50 /* SecCodeSigner.h */,
                                DC17874B1D7790A500B50D50 /* SecRequirementPriv.h */,
                                DC1785811D778B7F00B50D50 /* CodeSigning.h */,
                                DC1785821D778B7F00B50D50 /* CSCommon.h */,
                                DC1785831D778B7F00B50D50 /* SecCode.h */,
-                               DC1785841D778B8000B50D50 /* SecCodeHost.h */,
                                DC1785851D778B8000B50D50 /* SecRequirement.h */,
                                DC1785861D778B8000B50D50 /* SecStaticCode.h */,
                                DCD068141D8CDF7E007602F1 /* lib */,
                DCD06B3C1D8E0D7D007602F1 /* lib */ = {
                        isa = PBXGroup;
                        children = (
-                               DCD06AB11D8E0D7D007602F1 /* debugging.h */,
                                DCD06AB21D8E0D7D007602F1 /* FileLockTransaction.cpp */,
                                DCD06AB31D8E0D7D007602F1 /* FileLockTransaction.h */,
                                DCD06AB41D8E0D7D007602F1 /* CSPDLTransaction.cpp */,
                                DCEA5D541E2826DB0089CF55 /* CKKSSIV.m */,
                                DCE278DB1ED789EF0083B485 /* CKKSCurrentItemPointer.h */,
                                DCE278DC1ED789EF0083B485 /* CKKSCurrentItemPointer.m */,
+                               DC7341F11F8447AB00AB9BDF /* CKKSTLKShare.h */,
+                               DC7341F21F8447AB00AB9BDF /* CKKSTLKShare.m */,
                        );
                        name = "Sync Objects";
                        sourceTree = "<group>";
                                DC15F7651E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.m */,
                                DCD662F31E329B6800188186 /* CKKSNewTLKOperation.h */,
                                DCD662F41E329B6800188186 /* CKKSNewTLKOperation.m */,
+                               DCBF2F831F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.h */,
+                               DCBF2F841F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.m */,
                                DC7A17EB1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.h */,
                                DC7A17EC1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.m */,
                                DCA4D2131E5684220056214F /* CKKSReencryptOutgoingItemsOperation.h */,
                                DCE278E71ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.m */,
                                DCFE1C4F1F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.h */,
                                DCFE1C501F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.m */,
+                               DCAD9B421F8D939C00C5E2AE /* CKKSFixups.h */,
+                               DCAD9B431F8D939C00C5E2AE /* CKKSFixups.m */,
+                               DC3D748A1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.h */,
+                               DC3D748B1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.m */,
                        );
                        name = Operations;
                        sourceTree = "<group>";
                                D43DBED61E99D17100C04AEA /* asynchttp.h */,
                                D43DBED71E99D17100C04AEA /* nameconstraints.c */,
                                D43DBED81E99D17100C04AEA /* nameconstraints.h */,
-                               D43DBED91E99D17100C04AEA /* OTATrustUtilities.c */,
+                               D43DBED91E99D17100C04AEA /* OTATrustUtilities.m */,
                                D43DBEDA1E99D17100C04AEA /* OTATrustUtilities.h */,
                                D43DBEDB1E99D17100C04AEA /* personalization.c */,
                                D43DBEDC1E99D17100C04AEA /* personalization.h */,
                                D43761651EB2996C00954447 /* SecRevocationNetworking.m */,
                                D43DBEF31E99D17300C04AEA /* SecRevocationServer.c */,
                                D43DBEF41E99D17300C04AEA /* SecRevocationServer.h */,
-                               D43DBEF51E99D17300C04AEA /* SecTrustLoggingServer.c */,
+                               D43DBEF51E99D17300C04AEA /* SecTrustLoggingServer.m */,
                                D43DBEF61E99D17300C04AEA /* SecTrustLoggingServer.h */,
                                D43DBEF71E99D17300C04AEA /* SecTrustServer.c */,
                                D43DBEF81E99D17300C04AEA /* SecTrustServer.h */,
                                D4EC94FA1CEA482D0083E753 /* si-20-sectrust-policies-data */,
                                0C0C88771CCEC5BD00617D1B /* si-82-sectrust-ct-data */,
                                DCE4E72E1D7A436300AFB96E /* si-82-sectrust-ct-logs.plist */,
+                               D4C6C5C71FB2AD3F007EA57E /* si-87-sectrust-name-constraints */,
+                               BEB9EA2E1FFF1AF600676593 /* si-88-sectrust-valid-data */,
                                4C50ACFB1410671D00EE92DE /* DigiNotar */,
                                79679E241462028800CF997F /* DigicertMalaysia */,
                                E710C74B1331946500F85568 /* Supporting Files */,
                E7FCBE401314471B000DE34E /* Frameworks */ = {
                        isa = PBXGroup;
                        children = (
+                               5A94C6D4203CC2590066E391 /* AuthKit.framework */,
+                               5A94C6D1203CC1C60066E391 /* AOSAccountsLite.framework */,
+                               477A1F4C20320E4900ACD81D /* Accounts.framework */,
+                               EB49B2DE202DF286003F34A0 /* CoreFollowUpUI.framework */,
+                               EB49B2DC202DF251003F34A0 /* libbsm.tbd */,
+                               EB49B2CE202DF111003F34A0 /* CoreFollowUp.framework */,
+                               D4119E72202BDF2B0048587B /* libz.tbd */,
+                               472339681FD7156700CB6A72 /* CoreCDP.framework */,
+                               472339611FD7155C00CB6A72 /* libprequelite.dylib */,
+                               47D1838B1FB3827700CFCD89 /* OCMock.framework */,
+                               4727FBE81F9921D00003AE36 /* libACM.a */,
+                               4727FBE61F9921890003AE36 /* ApplePushService.framework */,
+                               4727FBE41F99217A0003AE36 /* SharedWebCredentials.framework */,
+                               4727FBE21F9921660003AE36 /* MobileKeyBag.framework */,
+                               4727FBE01F99212F0003AE36 /* IOKit.framework */,
+                               4727FBDE1F99211D0003AE36 /* libaks.a */,
+                               4727FBDC1F9920F10003AE36 /* libaks_acl.a */,
+                               4727FBDA1F9920CB0003AE36 /* WirelessDiagnostics.framework */,
+                               4727FBD81F9920BB0003AE36 /* SystemConfiguration.framework */,
+                               4727FBD41F9920510003AE36 /* ProtocolBuffer.framework */,
+                               4727FBD21F9920290003AE36 /* CloudKit.framework */,
+                               4727FBD01F991F990003AE36 /* libMobileGestalt.dylib */,
+                               4727FBCF1F991F820003AE36 /* SecurityFoundation.framework */,
+                               4727FBCC1F991F660003AE36 /* libsqlite3.dylib */,
+                               4727FBCA1F991F510003AE36 /* Security.framework */,
+                               4727FBC41F991C460003AE36 /* Foundation.framework */,
+                               D4C6C5CE1FB3B44C007EA57E /* libarchive.2.dylib */,
+                               D4C6C5CB1FB3B3CC007EA57E /* libarchive.tbd */,
+                               6CB96BB41F966E0C00E11457 /* libsqlite3.tbd */,
+                               6CFDC4561F907E1D00646DBB /* libprequelite.tbd */,
+                               D46246911F9AE2E400D63882 /* libDER.a */,
+                               D46246A91F9AE6C900D63882 /* libDER.a */,
+                               D46246AF1F9AE73F00D63882 /* libDER.a */,
+                               D46246C31F9AEA5200D63882 /* libDER.a */,
+                               D46246CE1F9AEAE300D63882 /* libDER.a */,
+                               0CE98B5B1FA9360700CF1D54 /* libprequelite.tbd */,
+                               F682C1CE1F4486F600F1B029 /* libctkloginhelper.a */,
                                5EAFA4CD1EF16059002DC188 /* LocalAuthentication.framework */,
                                D41D36701EB14D87007FA978 /* libDiagnosticMessagesClient.tbd */,
                                D47CA65C1EB036450038E2BB /* libMobileGestalt.dylib */,
                                E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */,
                                E7FCBE411314471B000DE34E /* UIKit.framework */,
                                E75E498C1C8F76680001A34F /* libASN1.a */,
-                               E75E498A1C8F76360001A34F /* libDER.a */,
                                DC1789121D7798B300B50D50 /* libDiagnosticMessagesClient.dylib */,
                                DC610A3C1D78F25C002223DE /* libDiagnosticMessagesClient.dylib */,
                                DC1789141D77997F00B50D50 /* libOpenScriptingUtil.dylib */,
                EB27FF051E402C3C00EC9E3A /* ckksctl */ = {
                        isa = PBXGroup;
                        children = (
-                               EB27FF0B1E402C8000EC9E3A /* ckksctl.h */,
                                EB27FF0C1E402C8000EC9E3A /* ckksctl.m */,
                                EB27FF2F1E408CC900EC9E3A /* ckksctl-Entitlements.plist */,
                        );
                                D47C56AF1DCA841D00E18518 /* lib_ios_x64_shim.xcconfig */,
                                DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */,
                                BE8351D41EC0EEDD00ACD5FD /* framework_requiring_modern_objc_runtime.xcconfig */,
+                               EBF9AE171F536D0300FECBF7 /* Version.xcconfig */,
                        );
                        name = xcconfig;
                        sourceTree = "<group>";
                        name = secitemstresstest;
                        sourceTree = "<group>";
                };
+               EB49B2AF202D8780003F34A0 /* secdmockaks */ = {
+                       isa = PBXGroup;
+                       children = (
+                               72D1E5F3202FE43C003A38C5 /* secdmock_db_version_10_5.h */,
+                               EBE700FE204676E700E00A87 /* secdmock_db_version_11_1.h */,
+                               EB49B2B0202D8780003F34A0 /* secdmockaks.m */,
+                               EB6667BE204CD65E000B404F /* testPlistDER.m */,
+                               EB49B303202FB8DE003F34A0 /* mockaks.h */,
+                               EB49B2E4202DFE7F003F34A0 /* mockaks.m */,
+                               EB49B2B2202D8780003F34A0 /* Info.plist */,
+                       );
+                       name = secdmockaks;
+                       path = tests/secdmockaks;
+                       sourceTree = "<group>";
+               };
                EB80211C1D3D9044008540C4 /* Modules */ = {
                        isa = PBXGroup;
                        children = (
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               225394D31E3083C600D3CD9B /* SecCodeHost.h in Headers */,
                                225394D41E3083D000D3CD9B /* CodeSigning.h in Headers */,
                                225394D51E3083DA00D3CD9B /* CSCommon.h in Headers */,
                                225394D61E3083E300D3CD9B /* SecCode.h in Headers */,
                                2296B0E61E32EF08000D1EA7 /* requirement.h in Headers */,
                                2296B0EC1E32EF10000D1EA7 /* cs.h in Headers */,
                                225394DB1E30864B00D3CD9B /* CSCommonPriv.h in Headers */,
+                               DC926F071F33F7C20012A315 /* SecCodeHost.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                4C32C1250A4976BF002891BD /* SecCertificate.h in Headers */,
                                4C32C1260A4976BF002891BD /* SecTrust.h in Headers */,
                                4CF0484C0A5D988F00268236 /* SecItem.h in Headers */,
+                               6CE3654F1FA100F10012F6AB /* SFAnalyticsDefines.h in Headers */,
                                4CF048800A5F016300268236 /* SecItemPriv.h in Headers */,
                                4C999BA60AB5F0BB0010451D /* NtlmGenerator.h in Headers */,
                                4C999BA80AB5F0BB0010451D /* ntlmBlobPriv.h in Headers */,
+                               EB5E3BCC2003C67A00F1631B /* SecSignpost.h in Headers */,
                                4C7608B30AC34A8100980096 /* SecCertificatePriv.h in Headers */,
+                               EB10A3E520356E2000E84270 /* OTConstants.h in Headers */,
                                4CEF4CA80C5551FE00062475 /* SecCertificateInternal.h in Headers */,
                                BE061FE11899ECEE00C739F6 /* SecSharedCredential.h in Headers */,
                                443381EE18A3D83A00215606 /* SecAccessControlPriv.h in Headers */,
+                               6CC952491FB4CB2D0051A823 /* SFAnalytics+Internal.h in Headers */,
                                DC3C73541D837B1900F6A832 /* SOSCloudCircle.h in Headers */,
                                524492941AFD6D480043695A /* der_plist.h in Headers */,
                                DC3C73531D837AF800F6A832 /* SOSPeerInfo.h in Headers */,
                                4C7072860AC9EA4F007CC205 /* SecKey.h in Headers */,
                                476541651F339F6300413F65 /* SecdWatchdog.h in Headers */,
                                4C7072D40AC9ED5A007CC205 /* SecKeyPriv.h in Headers */,
+                               DCD7EE981F4F4DE9007D9804 /* SecBase64.h in Headers */,
                                4C7073CA0ACB2BAD007CC205 /* SecRSAKey.h in Headers */,
                                EB6928C51D9C9C6E00062A18 /* SecRecoveryKey.h in Headers */,
                                4C0B906E0ACCBD240077CD03 /* SecFramework.h in Headers */,
                                4C7391790B01745000C4CBFA /* vmdh.h in Headers */,
+                               6CDB5FFB1FA78D2C00410924 /* SFAnalyticsMultiSampler.h in Headers */,
                                4C64E01C0B8FBC71009B306C /* SecIdentity.h in Headers */,
                                4C64E01D0B8FBC7E009B306C /* Security.h in Headers */,
+                               0C8BBF211FCB4F1800580909 /* OTControlProtocol.h in Headers */,
                                E7676DB619411DF300498DD4 /* SecServerEncryptionSupport.h in Headers */,
                                F964772C1E5832540019E4EB /* SecCodePriv.h in Headers */,
                                4C4296320BB0A68200491999 /* SecTrustSettings.h in Headers */,
                                4C1B442D0BB9CAF900461B82 /* SecTrustStore.h in Headers */,
                                DC3C7AB81D838C6F00F6A832 /* oidsalg.h in Headers */,
                                B61F67561F1FCFCA00E2FDBB /* SecPaddingConfigurationsPriv.h in Headers */,
-                               4CF41D0C0BBB4022005F3248 /* SecCertificatePath.h in Headers */,
                                4C2F81D50BF121D2003C4F77 /* SecRandom.h in Headers */,
                                ACBAF6EE1E941AE00007BA2F /* transform_regressions.h in Headers */,
                                7940D4130C3ACF9000FDB5D8 /* SecDH.h in Headers */,
                                4CE7EA791AEAF39C0067F5BD /* SecItemBackup.h in Headers */,
                                222F23A01DAC1603007ACB90 /* SecTaskPriv.h in Headers */,
                                DC3C7AB51D838C1300F6A832 /* SecAsn1Templates.h in Headers */,
+                               6CE365511FA100FE0012F6AB /* SFAnalyticsSampler.h in Headers */,
                                79EF5B6E0D3D6A31009F5270 /* SecImportExport.h in Headers */,
                                4723C9CA1F152ECE0082882F /* SFSQLiteStatement.h in Headers */,
                                4CCE0ADA0D41797400DDBB21 /* SecIdentityPriv.h in Headers */,
-                               4723C9DC1F1540CE0082882F /* SFAnalyticsLogger.h in Headers */,
                                4CCE0ADE0D4179E500DDBB21 /* SecBasePriv.h in Headers */,
-                               4CFBF6100D5A951100969BBE /* SecPolicyInternal.h in Headers */,
-                               DC3C7AB91D838C8D00F6A832 /* oids.h in Headers */,
+                               DCD7EE991F4F4E03007D9804 /* ocspTemplates.h in Headers */,
                                4C87F3A80D611C26000E7104 /* SecTrustPriv.h in Headers */,
                                79BDD3C20D60DB84000D84D3 /* SecCMS.h in Headers */,
                                DC2C5F4B1F0D935200FEBDA7 /* CKKSControlProtocol.h in Headers */,
                                107226D30D91DB32003CF14F /* SecTask.h in Headers */,
                                4C7CE5700DC7DC6600AE53FC /* SecEntitlements.h in Headers */,
+                               6CE365551FA101730012F6AB /* SFAnalyticsSQLiteStore.h in Headers */,
                                791766DE0DD0162C00F3B974 /* SecCertificateRequest.h in Headers */,
                                4C7416040F1D71A2008E0E4D /* SecSCEP.h in Headers */,
                                DC3C72E21D8374D600F6A832 /* SecureTransportPriv.h in Headers */,
                                4AF7FFFD15AFB73800B9D400 /* SecOTR.h in Headers */,
                                DC3C7AB21D838B6D00F6A832 /* SecureTransport.h in Headers */,
+                               6CBF65391FA147E500A68667 /* SFAnalyticsActivityTracker.h in Headers */,
                                4AF7FFFE15AFB73800B9D400 /* SecOTRDHKey.h in Headers */,
                                4AF7FFFF15AFB73800B9D400 /* SecOTRErrors.h in Headers */,
-                               4AF7000015AFB73800B9D400 /* SecOTRIdentityPriv.h in Headers */,
+                               6C73F48F2006B910003D5D63 /* SOSAnalytics.h in Headers */,
+                               DCD7EE9A1F4F5156007D9804 /* oidsocsp.h in Headers */,
+                               BE2AD2B31FDA07EF00739F96 /* OTBottledPeerRecord.h in Headers */,
                                4AF7000115AFB73800B9D400 /* SecOTRMath.h in Headers */,
                                4AF7000315AFB73800B9D400 /* SecOTRPacketData.h in Headers */,
                                DC3C7AB31D838BC300F6A832 /* CipherSuite.h in Headers */,
                                4AF7000415AFB73800B9D400 /* SecOTRPackets.h in Headers */,
+                               6C8CE6C11FA248DA0032ADF0 /* SFAnalyticsActivityTracker+Internal.h in Headers */,
                                DC3C7ABA1D838C9F00F6A832 /* sslTypes.h in Headers */,
+                               6CE3654B1FA100D00012F6AB /* SFAnalytics.h in Headers */,
                                4AF7000515AFB73800B9D400 /* SecOTRSession.h in Headers */,
                                D487B9821DFA28DB000410A1 /* SecInternalReleasePriv.h in Headers */,
                                4AF7000615AFB73800B9D400 /* SecOTRSessionPriv.h in Headers */,
                                EB69AB301BF4348000913AF1 /* SecEMCSPriv.h in Headers */,
                                D47F514C1C3B812500A7CEFE /* SecCFAllocator.h in Headers */,
+                               BEB0B0DB1FFC45C2007E6A83 /* OTPrivateKey+SF.h in Headers */,
                                8E02FA6B1107BE460043545E /* pbkdf2.h in Headers */,
                                8ED6F6CA110904E300D2B368 /* SecPBKDF.h in Headers */,
                                7901791812D51F7200CA4D44 /* SecCmsBase.h in Headers */,
                                22A23B3D1E3AAC9800C41830 /* SecStaticCode.h in Headers */,
                                724340BA1ED3FEC800F8F566 /* SecSMIME.h in Headers */,
                                22A23B3E1E3AAC9800C41830 /* SecRequirement.h in Headers */,
-                               22A23B3F1E3AAC9800C41830 /* SecCodeHost.h in Headers */,
+                               DC9C95BE1F79DC5F000D19E5 /* CKKSControl.h in Headers */,
+                               0CBFEACC200FCD33009A60E9 /* SFTransactionMetric.h in Headers */,
                                DC3C7AB61D838C2D00F6A832 /* SecAsn1Types.h in Headers */,
                                DC3C73551D837B2C00F6A832 /* SOSPeerInfoPriv.h in Headers */,
+                               D46246A31F9AE59E00D63882 /* oids.h in Headers */,
+                               DCD7EEA41F4F58D7007D9804 /* SecLogging.h in Headers */,
+                               47A05B161FDB5D9E00D0816E /* SFKeychainControl.h in Headers */,
                                7901791912D51F7200CA4D44 /* SecCmsContentInfo.h in Headers */,
                                7901791A12D51F7200CA4D44 /* SecCmsDecoder.h in Headers */,
                                7901791B12D51F7200CA4D44 /* SecCmsDigestContext.h in Headers */,
                                7901791C12D51F7200CA4D44 /* SecCmsEncoder.h in Headers */,
+                               0C8BBF201FCB4F1800580909 /* OTControl.h in Headers */,
                                7901791D12D51F7200CA4D44 /* SecCmsEnvelopedData.h in Headers */,
                                7901791E12D51F7200CA4D44 /* SecCmsMessage.h in Headers */,
                                7901791F12D51F7200CA4D44 /* SecCmsRecipientInfo.h in Headers */,
                                DC0BC6721D8B755200070CB0 /* ellipticMeasure.h in Headers */,
                                DC0BC6711D8B755200070CB0 /* elliptic.h in Headers */,
                                DC0BC66E1D8B755200070CB0 /* ECDSA_Profile.h in Headers */,
-                               DC0BC6651D8B755200070CB0 /* CryptKit.h in Headers */,
                                DC0BC69B1D8B755200070CB0 /* platform.h in Headers */,
                                DC0BC6581D8B755200070CB0 /* ckconfig.h in Headers */,
                                DC0BC6831D8B755200070CB0 /* feeFEED.h in Headers */,
                                DC0BC6741D8B755200070CB0 /* ellipticProj.h in Headers */,
                                DC0BC6521D8B755200070CB0 /* byteRep.h in Headers */,
                                DC0BC6851D8B755200070CB0 /* feeFEEDExp.h in Headers */,
-                               DC0BC6641D8B755200070CB0 /* CryptKitSA.h in Headers */,
                                DC0BC6571D8B755200070CB0 /* CipherFileTypes.h in Headers */,
                                DC0BC6691D8B755200070CB0 /* CryptKitDER.h in Headers */,
                                DC0BC65C1D8B755200070CB0 /* ckMD5.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               DC1785021D77873100B50D50 /* Headers */ = {
+               DC1789011D77980500B50D50 /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               D46246A81F9AE64000D63882 /* oids.h in Headers */,
                                DC1785251D7789AF00B50D50 /* AuthSession.h in Headers */,
                                DC1785211D7789AF00B50D50 /* Authorization.h in Headers */,
                                DC1785221D7789AF00B50D50 /* AuthorizationDB.h in Headers */,
                                DC1785231D7789AF00B50D50 /* AuthorizationPlugin.h in Headers */,
                                DC17875F1D7790E500B50D50 /* AuthorizationPriv.h in Headers */,
                                DC1785241D7789AF00B50D50 /* AuthorizationTags.h in Headers */,
+                               EB5E3BCD2003C67B00F1631B /* SecSignpost.h in Headers */,
                                DC1787601D7790E500B50D50 /* AuthorizationTagsPriv.h in Headers */,
                                DC1785901D778B9D00B50D50 /* CMSDecoder.h in Headers */,
                                DC1785911D778B9D00B50D50 /* CMSEncoder.h in Headers */,
+                               EB10A3FC2035789B00E84270 /* OTConstants.h in Headers */,
                                DC1787591D7790B600B50D50 /* CMSPrivate.h in Headers */,
                                DC1785881D778B8000B50D50 /* CSCommon.h in Headers */,
                                DC17874E1D7790A500B50D50 /* CSCommonPriv.h in Headers */,
                                DC17851A1D77895A00B50D50 /* SecAsn1Types.h in Headers */,
                                DC17874F1D7790A500B50D50 /* SecAssessment.h in Headers */,
                                DC1785931D778BEE00B50D50 /* SecBase.h in Headers */,
+                               DC2671071F3E8A0900816EED /* SecECKey.h in Headers */,
                                DC17877C1D77919500B50D50 /* SecBasePriv.h in Headers */,
+                               0C8BBF231FCB4F1800580909 /* OTControlProtocol.h in Headers */,
                                DC1787741D77915500B50D50 /* SecBreadcrumb.h in Headers */,
                                DC1787761D77916600B50D50 /* SecCFAllocator.h in Headers */,
                                DC1787111D778FA900B50D50 /* SecCMS.h in Headers */,
                                DC17871C1D778FAA00B50D50 /* SecCmsSignedData.h in Headers */,
                                DC17871D1D778FAA00B50D50 /* SecCmsSignerInfo.h in Headers */,
                                DC1785891D778B8000B50D50 /* SecCode.h in Headers */,
-                               DC17858A1D778B8000B50D50 /* SecCodeHost.h in Headers */,
-                               DC1787501D7790A500B50D50 /* SecCodeHostLib.h in Headers */,
                                DC1787511D7790A500B50D50 /* SecCodePriv.h in Headers */,
                                DC1787521D7790A500B50D50 /* SecCodeSigner.h in Headers */,
                                DC1785301D778A0100B50D50 /* SecCustomTransform.h in Headers */,
+                               0CBFEACD200FCD33009A60E9 /* SFTransactionMetric.h in Headers */,
                                DC1787771D77916A00B50D50 /* SecDH.h in Headers */,
                                DC1785311D778A0100B50D50 /* SecDecodeTransform.h in Headers */,
+                               6CE365561FA101740012F6AB /* SFAnalyticsSQLiteStore.h in Headers */,
                                DC1785321D778A0100B50D50 /* SecDigestTransform.h in Headers */,
                                DC1785331D778A0100B50D50 /* SecEncodeTransform.h in Headers */,
                                DC1785341D778A0100B50D50 /* SecEncryptTransform.h in Headers */,
                                DC1787781D77917100B50D50 /* SecItemBackup.h in Headers */,
                                DC17877F1D7791A800B50D50 /* SecItemPriv.h in Headers */,
                                DC17859D1D778C8000B50D50 /* SecKey.h in Headers */,
+                               6CC952481FB4CB2C0051A823 /* SFAnalytics+Internal.h in Headers */,
                                DC1787801D7791AD00B50D50 /* SecKeyPriv.h in Headers */,
                                DC1785521D778ACD00B50D50 /* SecKeychain.h in Headers */,
                                DC1785531D778ACD00B50D50 /* SecKeychainItem.h in Headers */,
+                               0C8BBF221FCB4F1800580909 /* OTControl.h in Headers */,
                                DC1787391D77903700B50D50 /* SecKeychainItemExtendedAttributes.h in Headers */,
                                DC17873A1D77903700B50D50 /* SecKeychainItemPriv.h in Headers */,
                                DC17873B1D77903700B50D50 /* SecKeychainPriv.h in Headers */,
                                DC17873E1D77903700B50D50 /* SecRandomP.h in Headers */,
                                DC1785351D778A0100B50D50 /* SecReadTransform.h in Headers */,
                                DC17873F1D77903700B50D50 /* SecRecoveryPassword.h in Headers */,
+                               6CE3654C1FA100D10012F6AB /* SFAnalytics.h in Headers */,
                                DC17858B1D778B8000B50D50 /* SecRequirement.h in Headers */,
                                DC1787551D7790A500B50D50 /* SecRequirementPriv.h in Headers */,
                                DC17871E1D778FAA00B50D50 /* SecSMIME.h in Headers */,
                                DC1786F41D778EF800B50D50 /* SecTranslocate.h in Headers */,
                                DC1785A01D778C9400B50D50 /* SecTrust.h in Headers */,
                                DC1787841D7791C900B50D50 /* SecTrustPriv.h in Headers */,
+                               6CDB5FFC1FA78D2D00410924 /* SFAnalyticsMultiSampler.h in Headers */,
                                DC1785A11D778C9A00B50D50 /* SecTrustSettings.h in Headers */,
                                DC1787851D7791CE00B50D50 /* SecTrustSettingsPriv.h in Headers */,
                                DC1785561D778ACD00B50D50 /* SecTrustedApplication.h in Headers */,
                                DC1787411D77903700B50D50 /* TrustSettingsSchema.h in Headers */,
                                D487B9881DFA2902000410A1 /* SecInternalReleasePriv.h in Headers */,
                                DC1787721D77911D00B50D50 /* X509Templates.h in Headers */,
+                               DC926F081F33F7D30012A315 /* SecCodeHost.h in Headers */,
                                DC17876A1D77911D00B50D50 /* asn1Templates.h in Headers */,
                                DC17876B1D77911D00B50D50 /* certExtensionTemplates.h in Headers */,
                                DC1785971D778C0800B50D50 /* certextensions.h in Headers */,
                                DC17876C1D77911D00B50D50 /* csrTemplates.h in Headers */,
                                DC17856C1D778B4A00B50D50 /* cssm.h in Headers */,
                                DC17856D1D778B4A00B50D50 /* cssmaci.h in Headers */,
+                               6CBF65401FA1480C00A68667 /* SFAnalyticsActivityTracker.h in Headers */,
                                DC17856E1D778B4A00B50D50 /* cssmapi.h in Headers */,
                                DC1785991D778C5300B50D50 /* cssmapple.h in Headers */,
                                DC1787431D77906C00B50D50 /* cssmapplePriv.h in Headers */,
                                DC17856F1D778B4A00B50D50 /* cssmcli.h in Headers */,
                                DC1785701D778B4A00B50D50 /* cssmconfig.h in Headers */,
                                DC1785711D778B4A00B50D50 /* cssmcspi.h in Headers */,
+                               6C73F4902006B911003D5D63 /* SOSAnalytics.h in Headers */,
                                DC1785721D778B4A00B50D50 /* cssmdli.h in Headers */,
+                               DC337B1F1EA04E2100B3A1F0 /* SecBase64.h in Headers */,
                                DC1785731D778B4A00B50D50 /* cssmerr.h in Headers */,
                                DC1785741D778B4A00B50D50 /* cssmkrapi.h in Headers */,
                                DC1785751D778B4A00B50D50 /* cssmkrspi.h in Headers */,
                                DC17877B1D77918C00B50D50 /* der_plist.h in Headers */,
                                DC1785791D778B4A00B50D50 /* eisl.h in Headers */,
                                DC17857A1D778B4A00B50D50 /* emmspi.h in Headers */,
+                               6C8CE6C21FA248DB0032ADF0 /* SFAnalyticsActivityTracker+Internal.h in Headers */,
                                DC17857B1D778B4A00B50D50 /* emmtype.h in Headers */,
                                DC17876D1D77911D00B50D50 /* keyTemplates.h in Headers */,
                                DC17853D1D778A3100B50D50 /* mds.h in Headers */,
                                DC17853C1D778A3100B50D50 /* mds_schema.h in Headers */,
                                DC1787231D778FC900B50D50 /* mdspriv.h in Headers */,
+                               DC2671001F3E766E00816EED /* SecOTRSession.h in Headers */,
                                DC17876E1D77911D00B50D50 /* nameTemplates.h in Headers */,
                                DC17876F1D77911D00B50D50 /* ocspTemplates.h in Headers */,
-                               DC1785431D778A7400B50D50 /* oids.h in Headers */,
                                DC1785161D77895A00B50D50 /* oidsalg.h in Headers */,
                                DC1785171D77895A00B50D50 /* oidsattr.h in Headers */,
                                DCCBFA391DBAE445001DD54D /* SecInternal.h in Headers */,
                                DC1787711D77911D00B50D50 /* secasn1t.h in Headers */,
                                DC1786FC1D778F3D00B50D50 /* sslTypes.h in Headers */,
                                DC17871F1D778FAA00B50D50 /* tsaSupport.h in Headers */,
-                               DC1787201D778FAA00B50D50 /* tsaSupportPriv.h in Headers */,
-                               DC1787211D778FAA00B50D50 /* tsaTemplates.h in Headers */,
                                DC17857F1D778B4A00B50D50 /* x509defs.h in Headers */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               DC1789011D77980500B50D50 /* Headers */ = {
-                       isa = PBXHeadersBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
+                               DCB3323B1F4681AE00178C30 /* SecOTR.h in Headers */,
                                4723C9CB1F152ECF0082882F /* SFSQLiteStatement.h in Headers */,
+                               6CE365501FA100F20012F6AB /* SFAnalyticsDefines.h in Headers */,
+                               6CE365521FA100FF0012F6AB /* SFAnalyticsSampler.h in Headers */,
                                4723C9C31F152EB60082882F /* SFObjCType.h in Headers */,
+                               DCB3323C1F46833E00178C30 /* SecLogging.h in Headers */,
+                               DC9C95BD1F79DC5A000D19E5 /* CKKSControl.h in Headers */,
                                DC3C73561D837B9B00F6A832 /* SOSPeerInfoPriv.h in Headers */,
                                EB6928C61D9C9C6F00062A18 /* SecRecoveryKey.h in Headers */,
-                               4723C9DD1F1540CE0082882F /* SFAnalyticsLogger.h in Headers */,
                                4723C9C71F152EC10082882F /* SFSQLite.h in Headers */,
+                               47A05B171FDB5D9F00D0816E /* SFKeychainControl.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               47922D431FAA7C260008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.h in Headers */,
                                DCFE1C351F17ECE5007640C8 /* CKKSCondition.h in Headers */,
                                6C3446461E25346C00F9522B /* CKKSRateLimiter.h in Headers */,
                                DC2C5F5E1F0EB97E00FEBDA7 /* CKKSNotifier.h in Headers */,
                                DC5BB4FF1E0C98320010F836 /* CKKSOutgoingQueueOperation.h in Headers */,
                                DC222C651E034D1F00B09171 /* SOSChangeTracker.h in Headers */,
+                               47922D551FAA7E070008F7E0 /* SecDbKeychainSerializedItemV7.h in Headers */,
+                               0C770EC21FCF7C9800B5F0E2 /* OTCloudStore.h in Headers */,
+                               DC14478B1F5764C600236DB4 /* CKKSResultOperation.h in Headers */,
                                DCFE1C521F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.h in Headers */,
                                DCBDB3BC1E57CA7A00B61300 /* CKKSViewManager.h in Headers */,
                                DC762A9F1E57A86A00B03A2C /* CKKSRecordHolder.h in Headers */,
                                DC1DA65F1E4554620094CE7F /* CKKSScanLocalItemsOperation.h in Headers */,
                                DC222C661E034D1F00B09171 /* SOSEngine.h in Headers */,
+                               0C8BBF1E1FCB4F0400580909 /* OTControl.h in Headers */,
                                DCB5D93C1E4A9A3400BE22AB /* CKKSSynchronizeOperation.h in Headers */,
-                               479108B81EE879F9008CEFA0 /* CKKSAnalyticsLogger.h in Headers */,
+                               479108B81EE879F9008CEFA0 /* CKKSAnalytics.h in Headers */,
                                DC222C671E034D1F00B09171 /* SecDbKeychainItem.h in Headers */,
                                DC222C681E034D1F00B09171 /* SecDbQuery.h in Headers */,
                                DCEA5D561E2826DB0089CF55 /* CKKSSIV.h in Headers */,
                                DC222C6A1E034D1F00B09171 /* CKKSZoneStateEntry.h in Headers */,
                                DC94BCCB1F10448600E07CEB /* CloudKitCategories.h in Headers */,
                                DCFE1C281F17E455007640C8 /* CKKSDeviceStateEntry.h in Headers */,
+                               BEE4B1931FFD604B00777D39 /* OTAuthenticatedCiphertext+SF.h in Headers */,
                                DCFB12C61E95A4C000510F5F /* CKKSCKAccountStateTracker.h in Headers */,
                                DC222C6B1E034D1F00B09171 /* SecItemDataSource.h in Headers */,
+                               DC7341F41F8447AB00AB9BDF /* CKKSTLKShare.h in Headers */,
                                DC18F7701E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.h in Headers */,
                                DC222C6C1E034D1F00B09171 /* CKKSIncomingQueueEntry.h in Headers */,
+                               47922D471FAA7C350008F7E0 /* SecDbKeychainSerializedMetadata.h in Headers */,
                                DC9082C71EA027DC00D0C1C5 /* CKKSZoneChangeFetcher.h in Headers */,
                                DCA4D2161E5684220056214F /* CKKSReencryptOutgoingItemsOperation.h in Headers */,
+                               BEE4B1991FFDAFE600777D39 /* SFPublicKey+SPKI.h in Headers */,
                                DC222C6D1E034D1F00B09171 /* SecItemDb.h in Headers */,
                                DC222C6E1E034D1F00B09171 /* SecItemSchema.h in Headers */,
+                               DCAD9B451F8D939C00C5E2AE /* CKKSFixups.h in Headers */,
+                               DC9C95B51F79CFD1000D19E5 /* CKKSControl.h in Headers */,
                                DC222C6F1E034D1F00B09171 /* SecKeybagSupport.h in Headers */,
+                               DC3D748D1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.h in Headers */,
                                DC222C701E034D1F00B09171 /* iCloudTrace.h in Headers */,
                                DCEA5D861E2F14810089CF55 /* CKKSAPSReceiver.h in Headers */,
                                DC222C711E034D1F00B09171 /* CKKSOutgoingQueueEntry.h in Headers */,
                                DCCD88E91E42622200F5AA71 /* CKKSGroupOperation.h in Headers */,
                                DC15F7671E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.h in Headers */,
                                DCD6C4B31EC5302500414FEE /* CKKSNearFutureScheduler.h in Headers */,
+                               0C8BBF251FCB4FE800580909 /* OTManager.h in Headers */,
+                               DCBF2F861F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.h in Headers */,
                                DCE278E91ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.h in Headers */,
+                               0C8BBF1F1FCB4F0400580909 /* OTControlProtocol.h in Headers */,
                                DCD662F61E329B6800188186 /* CKKSNewTLKOperation.h in Headers */,
+                               DC1447971F5766D200236DB4 /* NSOperationCategories.h in Headers */,
                                DC4DB1511E24692100CD6769 /* CKKSKey.h in Headers */,
                                DCE278DE1ED789EF0083B485 /* CKKSCurrentItemPointer.h in Headers */,
+                               DA6AA1681FE88AFB004565B0 /* CKKSControlServer.h in Headers */,
                                DC222C731E034D1F00B09171 /* CKKSItem.h in Headers */,
+                               4733377A1FDAFBCC00E19F30 /* SFKeychainControlManager.h in Headers */,
+                               47922D4B1FAA7C440008F7E0 /* SecDbKeychainSerializedSecretData.h in Headers */,
                                DC7A17EE1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               47922D421FAA7C240008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.h in Headers */,
                                DCFE1C341F17ECE5007640C8 /* CKKSCondition.h in Headers */,
                                DC1DA65E1E4554620094CE7F /* CKKSScanLocalItemsOperation.h in Headers */,
                                DC2C5F5D1F0EB97E00FEBDA7 /* CKKSNotifier.h in Headers */,
                                DCCD88E81E42622200F5AA71 /* CKKSGroupOperation.h in Headers */,
                                6CC1859E1E24E8EB009657D8 /* CKKSRateLimiter.h in Headers */,
+                               47922D541FAA7E060008F7E0 /* SecDbKeychainSerializedItemV7.h in Headers */,
+                               0C770EBC1FCF7C9800B5F0E2 /* OTCloudStore.h in Headers */,
+                               DC14478A1F5764C600236DB4 /* CKKSResultOperation.h in Headers */,
                                DCFE1C511F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.h in Headers */,
                                DCBDB3BB1E57CA7A00B61300 /* CKKSViewManager.h in Headers */,
                                DC762A9E1E57A86A00B03A2C /* CKKSRecordHolder.h in Headers */,
                                DC5BB4FE1E0C98320010F836 /* CKKSOutgoingQueueOperation.h in Headers */,
                                DCB5D93B1E4A9A3400BE22AB /* CKKSSynchronizeOperation.h in Headers */,
+                               0C8BBF1C1FCB4F0300580909 /* OTControl.h in Headers */,
                                DC52E7E81D80BE8700B0A59C /* SOSChangeTracker.h in Headers */,
-                               479108B71EE879F9008CEFA0 /* CKKSAnalyticsLogger.h in Headers */,
+                               479108B71EE879F9008CEFA0 /* CKKSAnalytics.h in Headers */,
                                DC52E7E51D80BE7400B0A59C /* SOSEngine.h in Headers */,
                                DC52E7E41D80BE6E00B0A59C /* SecDbKeychainItem.h in Headers */,
                                DC7A17ED1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.h in Headers */,
                                DC378B2D1DEF9DF000A3DAFA /* CKKSMirrorEntry.h in Headers */,
                                DC94BCCA1F10448600E07CEB /* CloudKitCategories.h in Headers */,
                                DCFE1C271F17E455007640C8 /* CKKSDeviceStateEntry.h in Headers */,
+                               BEE4B1921FFD604B00777D39 /* OTAuthenticatedCiphertext+SF.h in Headers */,
                                DCFB12C51E95A4C000510F5F /* CKKSCKAccountStateTracker.h in Headers */,
                                DC378B381DEFADB500A3DAFA /* CKKSZoneStateEntry.h in Headers */,
+                               DC7341F31F8447AB00AB9BDF /* CKKSTLKShare.h in Headers */,
                                DC52E7E71D80BE8100B0A59C /* SecItemDataSource.h in Headers */,
                                DC18F76F1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.h in Headers */,
+                               47922D461FAA7C340008F7E0 /* SecDbKeychainSerializedMetadata.h in Headers */,
                                DC9082C61EA027DB00D0C1C5 /* CKKSZoneChangeFetcher.h in Headers */,
                                DCA4D2151E5684220056214F /* CKKSReencryptOutgoingItemsOperation.h in Headers */,
+                               BEE4B1981FFDAFE600777D39 /* SFPublicKey+SPKI.h in Headers */,
                                DC378B3C1DF0CA7200A3DAFA /* CKKSIncomingQueueEntry.h in Headers */,
                                DC52E7E61D80BE7B00B0A59C /* SecItemDb.h in Headers */,
+                               DCAD9B441F8D939C00C5E2AE /* CKKSFixups.h in Headers */,
+                               DC9C95B41F79CFD1000D19E5 /* CKKSControl.h in Headers */,
                                DC52E7EA1D80BE9500B0A59C /* SecItemSchema.h in Headers */,
+                               DC3D748C1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.h in Headers */,
                                DC52E7E91D80BE8D00B0A59C /* SecKeybagSupport.h in Headers */,
                                DCD662F51E329B6800188186 /* CKKSNewTLKOperation.h in Headers */,
                                DC52E7EB1D80BE9B00B0A59C /* iCloudTrace.h in Headers */,
                                DC6D2C931DD2836500BE372D /* CKKSOutgoingQueueEntry.h in Headers */,
                                DC15F7661E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.h in Headers */,
                                DCD6C4B21EC5302500414FEE /* CKKSNearFutureScheduler.h in Headers */,
+                               0C8BBF241FCB4FE700580909 /* OTManager.h in Headers */,
+                               DCBF2F851F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.h in Headers */,
                                DCE278E81ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.h in Headers */,
+                               0C8BBF1D1FCB4F0300580909 /* OTControlProtocol.h in Headers */,
                                DCEA5D851E2F14810089CF55 /* CKKSAPSReceiver.h in Headers */,
+                               DC1447961F5766D200236DB4 /* NSOperationCategories.h in Headers */,
                                DC4DB1501E24692100CD6769 /* CKKSKey.h in Headers */,
                                DCE278DD1ED789EF0083B485 /* CKKSCurrentItemPointer.h in Headers */,
+                               DA6AA1671FE88AFB004565B0 /* CKKSControlServer.h in Headers */,
                                DCEA5D551E2826DB0089CF55 /* CKKSSIV.h in Headers */,
+                               473337791FDAFBCC00E19F30 /* SFKeychainControlManager.h in Headers */,
+                               47922D4A1FAA7C430008F7E0 /* SecDbKeychainSerializedSecretData.h in Headers */,
                                DCDCCB8F1DF7B8D4006E840E /* CKKSItem.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               DCB3325A1F478C4100178C30 /* SOSUserKeygen.h in Headers */,
                                DC52E9071D80C3B300B0A59C /* SOSARCDefines.h in Headers */,
                                0C48990B1E0E0FF300C6CF70 /* SOSTransportCircleCK.h in Headers */,
                                DC52E9101D80C3EF00B0A59C /* SOSAccountLog.h in Headers */,
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               DCB332381F46804600178C30 /* SOSSysdiagnose.h in Headers */,
+                               DCE5DC101EA802DA006308A6 /* secToolFileIO.h in Headers */,
+                               DCE5DC111EA80348006308A6 /* accountCirclesViewsPrint.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               DC59E9AD1D91C9DC001BDDF5 /* Headers */ = {
-                       isa = PBXHeadersBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               DC59EA0F1D91CA15001BDDF5 /* Headers */ = {
-                       isa = PBXHeadersBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               DC59EA311D91CA2C001BDDF5 /* printFields.h in Headers */,
-                               DC59EA2D1D91CA2C001BDDF5 /* libDERUtils.h in Headers */,
-                               DC59EA301D91CA2C001BDDF5 /* fileIo.h in Headers */,
+                               47A05B181FDB5DBC00D0816E /* SFKeychainControl.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               DC71D9E51D95BB0A0065FB93 /* Headers */ = {
-                       isa = PBXHeadersBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               DC3832DA1DB7050900385F63 /* module.modulemap in Headers */,
-                               DC71D9E61D95BB0A0065FB93 /* oidsPriv.h in Headers */,
-                               DC71D9E71D95BB0A0065FB93 /* libDER.h in Headers */,
-                               DC71D9E81D95BB0A0065FB93 /* DER_Decode.h in Headers */,
-                               DC71D9E91D95BB0A0065FB93 /* DER_Keys.h in Headers */,
-                               DC71D9EA1D95BB0A0065FB93 /* DER_Encode.h in Headers */,
-                               DC963EC51D95F52C008A153E /* oids.h in Headers */,
-                               DC71D9EB1D95BB0A0065FB93 /* DER_Digest.h in Headers */,
-                               DC71D9ED1D95BB0A0065FB93 /* asn1Types.h in Headers */,
-                               DC71D9EE1D95BB0A0065FB93 /* libDER_config.h in Headers */,
-                               DC71D9EF1D95BB0A0065FB93 /* DER_CertCrl.h in Headers */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                DC8834021D8A218F00CE0ACA /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        buildActionMask = 2147483647;
                        files = (
                                DCB3438F1D8A32A20054D16E /* tsaDERUtilities.h in Headers */,
-                               DCB3438C1D8A32A20054D16E /* SecCertificateP.h in Headers */,
-                               DCB343881D8A32A20054D16E /* SecCertificatePrivP.h in Headers */,
                                DCB343651D8A32A20054D16E /* TrustSettings.h in Headers */,
                                DCB343831D8A32A20054D16E /* TrustStore.h in Headers */,
                                DCB343941D8A32A20054D16E /* SecExternalRep.h in Headers */,
                                DCB343851D8A32A20054D16E /* UnlockReferralItem.h in Headers */,
                                DCB343A41D8A32A20054D16E /* SecNetscapeTemplates.h in Headers */,
                                DCB343481D8A32A20054D16E /* Globals.h in Headers */,
-                               DCB3438D1D8A32A20054D16E /* SecCertificateInternalP.h in Headers */,
                                DCB3437F1D8A32A20054D16E /* TrustAdditions.h in Headers */,
                                DCB3436D1D8A32A20054D16E /* cssmdatetime.h in Headers */,
                                DCB343711D8A32A20054D16E /* DLDBListCFPref.h in Headers */,
                        buildActionMask = 2147483647;
                        files = (
                                DCEDE3961D80B12600C3826E /* SecTrustInternal.h in Headers */,
-                               DCEDE3951D80B12000C3826E /* secToolFileIO.h in Headers */,
                                DCEDE3941D80B11800C3826E /* SecPasswordGenerate.h in Headers */,
                                DCEDE3931D80B11200C3826E /* SecOTR.h in Headers */,
                                DCEDE3921D80B10E00C3826E /* SecOTRDHKey.h in Headers */,
                                DCC0937E1D80B0A700F984E4 /* SecOTRPacketData.h in Headers */,
                                DCC0937D1D80B09E00F984E4 /* SecOTRPackets.h in Headers */,
                                DCC0937C1D80B09200F984E4 /* SecSignatureVerificationSupport.h in Headers */,
-                               48C2F93C1E4BD00F0093D70C /* accountCirclesViewsPrint.h in Headers */,
                                DCC0937B1D80B07B00F984E4 /* SecOTRSession.h in Headers */,
                                DCC0937A1D80B07200F984E4 /* SecOTRSessionPriv.h in Headers */,
                                DCC093791D80B02100F984E4 /* SecOnOSX.h in Headers */,
                                DCD068591D8CDF7E007602F1 /* kerneldiskrep.h in Headers */,
                                DCD0685F1D8CDF7E007602F1 /* diskimagerep.h in Headers */,
                                DCD069001D8CDFFE007602F1 /* CharInputBuffer.hpp in Headers */,
-                               DCD068691D8CDF7E007602F1 /* SecCodeHostLib.h in Headers */,
                                DCD068F61D8CDFFE007602F1 /* ANTLRUtil.hpp in Headers */,
                                DCD069161D8CDFFF007602F1 /* SemanticException.hpp in Headers */,
                                DC1002D81D8E1A670025549C /* SecTask.h in Headers */,
                                DCD06B821D8E0D7D007602F1 /* utilities.h in Headers */,
                                DCD06B521D8E0D7D007602F1 /* devrandom.h in Headers */,
                                DCD06B751D8E0D7D007602F1 /* threading.h in Headers */,
-                               DCD06B3D1D8E0D7D007602F1 /* debugging.h in Headers */,
                                DCD06B611D8E0D7D007602F1 /* logging.h in Headers */,
                                DCD06B471D8E0D7D007602F1 /* alloc.h in Headers */,
                                DCD06B731D8E0D7D007602F1 /* superblob.h in Headers */,
                                DCD06B951D8E0D7D007602F1 /* vproc++.h in Headers */,
                                DCD06BAA1D8E0D7D007602F1 /* cfmunge.h in Headers */,
                                DCD06B6A1D8E0D7D007602F1 /* seccfobject.h in Headers */,
+                               DC2670F21F3E6EC500816EED /* debugging.h in Headers */,
                                DCD06B411D8E0D7D007602F1 /* CSPDLTransaction.h in Headers */,
                                DCD06B4D1D8E0D7D007602F1 /* daemon.h in Headers */,
                                DCD06BAC1D8E0D7D007602F1 /* cfutilities.h in Headers */,
                        files = (
                                DCD8A15A1E09EE0F00E4FA0A /* SOSAccountTransaction.h in Headers */,
                                0CE760561E1316E900B4381E /* SOSAccountTrustClassic+Retirement.h in Headers */,
+                               DC2670FC1F3E72C400816EED /* SOSCircleDer.h in Headers */,
                                0CE760541E13155100B4381E /* SOSAccountTrustClassic+Circle.h in Headers */,
                                DCD8A15C1E09EE0F00E4FA0A /* SOSBackupSliceKeyBag.h in Headers */,
                                DCD8A15D1E09EE0F00E4FA0A /* SOSCircle.h in Headers */,
                                0C4899271E0F399B00C6CF70 /* SOSAccountTrustOctagon.h in Headers */,
-                               DCD8A15E1E09EE0F00E4FA0A /* SOSCircleDer.h in Headers */,
                                DCD8A15F1E09EE0F00E4FA0A /* SOSCirclePriv.h in Headers */,
                                DCD8A1601E09EE0F00E4FA0A /* SOSCircleRings.h in Headers */,
                                DCD8A1611E09EE0F00E4FA0A /* SOSCircleV2.h in Headers */,
                                DCD8A1861E09EE0F00E4FA0A /* SOSRingPeerInfoUtils.h in Headers */,
                                0CE760521E1314F700B4381E /* SOSAccountTrustClassic+Identity.h in Headers */,
                                DCD8A1871E09EE0F00E4FA0A /* SOSRingTypes.h in Headers */,
-                               DCD8A1881E09EE0F00E4FA0A /* SOSAccountPriv.h in Headers */,
                                DCD8A1DF1E09F76000E4FA0A /* SOSPeerInfoCollections.h in Headers */,
                                DCD8A1891E09EE0F00E4FA0A /* SOSRingUtils.h in Headers */,
                                DCD8A18A1E09EE0F00E4FA0A /* SOSRingV0.h in Headers */,
                                DCD8A1901E09EE0F00E4FA0A /* SOSAccountTrust.h in Headers */,
                                DCD8A1DE1E09F74700E4FA0A /* SOSPeerInfoV2.h in Headers */,
                                DCD8A1931E09EE0F00E4FA0A /* SOSTypes.h in Headers */,
-                               DCD8A1941E09EE0F00E4FA0A /* SOSUserKeygen.h in Headers */,
                                DCD8A1951E09EE0F00E4FA0A /* SOSViews.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                                DC00ABD11D821F1A00513D74 /* PBXTargetDependency */,
                                DC00ABD31D821F1D00513D74 /* PBXTargetDependency */,
                                DCD8A1EF1E09F8BC00E4FA0A /* PBXTargetDependency */,
-                               DC59EA901D91CDC6001BDDF5 /* PBXTargetDependency */,
                                DC65E75A1D8CB48900152EF0 /* PBXTargetDependency */,
                                DC59E9A91D91C7CC001BDDF5 /* PBXTargetDependency */,
                                DC65E75C1D8CB49200152EF0 /* PBXTargetDependency */,
                        productReference = 0C2BCBCE1D0648D100ED7A2F /* dtlsEchoServer */;
                        productType = "com.apple.product-type.tool";
                };
+               0C85DFD11FB38BB6000343A7 /* OTTests */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 0C85E0001FB38BB6000343A7 /* Build configuration list for PBXNativeTarget "OTTests" */;
+                       buildPhases = (
+                               0C85DFE21FB38BB6000343A7 /* Sources */,
+                               0C85DFE51FB38BB6000343A7 /* Frameworks */,
+                               0C85DFFD1FB38BB6000343A7 /* Embed OCMock */,
+                               0C85DFFF1FB38BB6000343A7 /* ShellScript */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                               0C85DFD41FB38BB6000343A7 /* PBXTargetDependency */,
+                               0C85DFD81FB38BB6000343A7 /* PBXTargetDependency */,
+                               0C85DFDA1FB38BB6000343A7 /* PBXTargetDependency */,
+                               0C85DFDC1FB38BB6000343A7 /* PBXTargetDependency */,
+                               0C85DFDE1FB38BB6000343A7 /* PBXTargetDependency */,
+                               0C85DFE01FB38BB6000343A7 /* PBXTargetDependency */,
+                       );
+                       name = OTTests;
+                       productName = CKKSTests;
+                       productReference = 0C85E0031FB38BB6000343A7 /* OTTests.xctest */;
+                       productType = "com.apple.product-type.bundle.unit-test";
+               };
+               0C8BBEFD1FCB446400580909 /* otctl */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 0C8BBF051FCB446400580909 /* Build configuration list for PBXNativeTarget "otctl" */;
+                       buildPhases = (
+                               0C8BBEFE1FCB446400580909 /* Sources */,
+                               0C8BBF021FCB446400580909 /* Frameworks */,
+                               0C8BBF041FCB446400580909 /* CopyFiles */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = otctl;
+                       productName = ckksctl;
+                       productReference = 0C8BBF081FCB446400580909 /* otctl */;
+                       productType = "com.apple.product-type.tool";
+               };
                225394AC1E3080A600D3CD9B /* security_codesigning_ios */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 225394B11E3080A600D3CD9B /* Build configuration list for PBXNativeTarget "security_codesigning_ios" */;
                        productReference = 470415CF1E5E14B5001F3D95 /* seckeychainnetworkextensionstest */;
                        productType = "com.apple.product-type.tool";
                };
+               4727FBB61F9918580003AE36 /* secdxctests_ios */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 4727FBC31F9918590003AE36 /* Build configuration list for PBXNativeTarget "secdxctests_ios" */;
+                       buildPhases = (
+                               4727FBB31F9918580003AE36 /* Sources */,
+                               4727FBB41F9918580003AE36 /* Frameworks */,
+                               4727FBB51F9918580003AE36 /* Resources */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                               47DE88D91FA7ADBB00DD3254 /* PBXTargetDependency */,
+                               47DE88D71FA7ADAC00DD3254 /* PBXTargetDependency */,
+                               47DE88D51FA7AD7000DD3254 /* PBXTargetDependency */,
+                               47DE88CE1FA7AD6200DD3254 /* PBXTargetDependency */,
+                       );
+                       name = secdxctests_ios;
+                       productName = secdxctests;
+                       productReference = 4727FBB71F9918580003AE36 /* secdxctests_ios.xctest */;
+                       productType = "com.apple.product-type.bundle.unit-test";
+               };
                47702B1D1E5F409700B29577 /* seckeychainnetworkextensionsystemdaemontest */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 47702B221E5F409700B29577 /* Build configuration list for PBXNativeTarget "seckeychainnetworkextensionsystemdaemontest" */;
                        productReference = 47702B2E1E5F492C00B29577 /* seckeychainnetworkextensionunauthorizedaccesstest */;
                        productType = "com.apple.product-type.tool";
                };
+               478D426C1FD72A8100CAB645 /* secdxctests_mac */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 478D42991FD72A8100CAB645 /* Build configuration list for PBXNativeTarget "secdxctests_mac" */;
+                       buildPhases = (
+                               478D42751FD72A8100CAB645 /* Sources */,
+                               478D427D1FD72A8100CAB645 /* Frameworks */,
+                               478D42981FD72A8100CAB645 /* Resources */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                               DC34CD3620326C3B00302481 /* PBXTargetDependency */,
+                               DC34CD3420326C3100302481 /* PBXTargetDependency */,
+                               DC34CD2D20326C2C00302481 /* PBXTargetDependency */,
+                               478D426D1FD72A8100CAB645 /* PBXTargetDependency */,
+                               478D426F1FD72A8100CAB645 /* PBXTargetDependency */,
+                               478D42711FD72A8100CAB645 /* PBXTargetDependency */,
+                               478D42731FD72A8100CAB645 /* PBXTargetDependency */,
+                       );
+                       name = secdxctests_mac;
+                       productName = secdxctests;
+                       productReference = 478D429C1FD72A8100CAB645 /* secdxctests_mac.xctest */;
+                       productType = "com.apple.product-type.bundle.unit-test";
+               };
                47C51B831EEA657D0032D9E5 /* SecurityUnitTests */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 47C51B931EEA657D0032D9E5 /* Build configuration list for PBXNativeTarget "SecurityUnitTests" */;
                        buildPhases = (
                                4C32C0AA0A4975F6002891BD /* Headers */,
                                E73288DD1AED7215008CE839 /* Copy SecureObjectSync Headers */,
+                               D4C263C41F8FEAA8001317EA /* Run Script Generate Error Strings */,
                                4C32C0AB0A4975F6002891BD /* Resources */,
                                4C32C0AC0A4975F6002891BD /* Sources */,
                                4C32C0AD0A4975F6002891BD /* Frameworks */,
                        );
                        dependencies = (
                                DC59E9A61D91C710001BDDF5 /* PBXTargetDependency */,
-                               DC59EA761D91CC5E001BDDF5 /* PBXTargetDependency */,
                                DCD22D7D1D8CCA18001C9B81 /* PBXTargetDependency */,
                                DCD22D7B1D8CCA07001C9B81 /* PBXTargetDependency */,
                                DCD8A19C1E09EEA200E4FA0A /* PBXTargetDependency */,
                        buildRules = (
                        );
                        dependencies = (
-                               DC59EA841D91CD2C001BDDF5 /* PBXTargetDependency */,
                                DC00ABAA1D821DE600513D74 /* PBXTargetDependency */,
                                DC00ABAC1D821DE700513D74 /* PBXTargetDependency */,
                                DCD8A1FB1E09F99700E4FA0A /* PBXTargetDependency */,
                        dependencies = (
                                D40B6A861E2B5F7600CD6EE5 /* PBXTargetDependency */,
                                DC89998B1E410DBF00E6E604 /* PBXTargetDependency */,
-                               DC59EA8D1D91CDB9001BDDF5 /* PBXTargetDependency */,
                                DC65E7561D8CB47600152EF0 /* PBXTargetDependency */,
                                DC00ABC91D821F0200513D74 /* PBXTargetDependency */,
                                DCD8A1E61E09F81300E4FA0A /* PBXTargetDependency */,
                        productReference = 5EBE247A1B00CCAE0007DB0E /* secacltests */;
                        productType = "com.apple.product-type.tool";
                };
+               6C46056B1F882B9B001421B6 /* KeychainAnalyticsTests */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 6C4605B51F882B9B001421B6 /* Build configuration list for PBXNativeTarget "KeychainAnalyticsTests" */;
+                       buildPhases = (
+                               6C46057A1F882B9B001421B6 /* Sources */,
+                               6C46059B1F882B9B001421B6 /* Frameworks */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                               6C9A49B21FAB647D00239D58 /* PBXTargetDependency */,
+                       );
+                       name = KeychainAnalyticsTests;
+                       productName = CKKSTests;
+                       productReference = 6C4605B81F882B9B001421B6 /* KeychainAnalyticsTests.xctest */;
+                       productType = "com.apple.product-type.bundle.unit-test";
+               };
                6C98082C1E788AEB00E70590 /* CKKSCloudKitTests_mac */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 6C98085E1E788AEB00E70590 /* Build configuration list for PBXNativeTarget "CKKSCloudKitTests_mac" */;
                        buildRules = (
                        );
                        dependencies = (
-                               6C98082D1E788AEB00E70590 /* PBXTargetDependency */,
                                6C98082F1E788AEB00E70590 /* PBXTargetDependency */,
                                6C9808311E788AEB00E70590 /* PBXTargetDependency */,
                                6C9808351E788AEB00E70590 /* PBXTargetDependency */,
                        );
                        dependencies = (
                                6C9808A41E788CB100E70590 /* PBXTargetDependency */,
-                               6C9808691E788AFD00E70590 /* PBXTargetDependency */,
                                6C98086B1E788AFD00E70590 /* PBXTargetDependency */,
                                6C98086D1E788AFD00E70590 /* PBXTargetDependency */,
                                6C9808711E788AFD00E70590 /* PBXTargetDependency */,
                        productReference = 6C98089D1E788AFD00E70590 /* CKKSCloudKitTests.xctest */;
                        productType = "com.apple.product-type.bundle.unit-test";
                };
+               6C9AA79D1F7C1D8F00D08296 /* supdctl */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 6C9AA7A21F7C1D9000D08296 /* Build configuration list for PBXNativeTarget "supdctl" */;
+                       buildPhases = (
+                               6C9AA79A1F7C1D8F00D08296 /* Sources */,
+                               6C9AA79B1F7C1D8F00D08296 /* Frameworks */,
+                               6C9AA79C1F7C1D8F00D08296 /* CopyFiles */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = supdctl;
+                       productName = supdctl;
+                       productReference = 6C9AA79E1F7C1D8F00D08296 /* supdctl */;
+                       productType = "com.apple.product-type.tool";
+               };
+               6CAA8D1F1F842FB3007B6E03 /* securityuploadd */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 6CAA8D241F842FB4007B6E03 /* Build configuration list for PBXNativeTarget "securityuploadd" */;
+                       buildPhases = (
+                               6CAA8D1C1F842FB3007B6E03 /* Sources */,
+                               6CAA8D1D1F842FB3007B6E03 /* Frameworks */,
+                               6CAA8D1E1F842FB3007B6E03 /* Copy Manpage */,
+                               6CAA8D361F84317F007B6E03 /* Install launchd plist */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = securityuploadd;
+                       productName = supd;
+                       productReference = 6CAA8D201F842FB3007B6E03 /* securityuploadd */;
+                       productType = "com.apple.product-type.tool";
+               };
                6CCDF7831E3C25FA003F2555 /* KeychainEntitledTestRunner */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 6CCDF7881E3C25FB003F2555 /* Build configuration list for PBXNativeTarget "KeychainEntitledTestRunner" */;
                        productReference = 6CF4A0E01E4549F200ECD7B5 /* KeychainEntitledTestApp.app */;
                        productType = "com.apple.product-type.application";
                };
-               728B56A016D59979008FA3AB /* OTAPKIAssetTool */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = 728B56AB16D59979008FA3AB /* Build configuration list for PBXNativeTarget "OTAPKIAssetTool" */;
-                       buildPhases = (
-                               728B569D16D59979008FA3AB /* Sources */,
-                               728B569E16D59979008FA3AB /* Frameworks */,
-                               22C002A21AC9D2D100B3469E /* ShellScript */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                       );
-                       name = OTAPKIAssetTool;
-                       productName = OTAPKIAssetTool;
-                       productReference = 728B56A116D59979008FA3AB /* OTAPKIAssetTool */;
-                       productType = "com.apple.product-type.tool";
-               };
                790851B50CA9859F0083CC4D /* securityd_ios */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 790851C90CA985C10083CC4D /* Build configuration list for PBXNativeTarget "securityd_ios" */;
                        buildRules = (
                        );
                        dependencies = (
-                               DC59EA7D1D91CCAA001BDDF5 /* PBXTargetDependency */,
                                DC65E7291D8CB2F400152EF0 /* PBXTargetDependency */,
                                D40B6A7F1E2B5F3D00CD6EE5 /* PBXTargetDependency */,
                                DC52E84B1D80BF1100B0A59C /* PBXTargetDependency */,
                        dependencies = (
                                D41257E81E941AD200781F23 /* PBXTargetDependency */,
                                D41257E61E941ACC00781F23 /* PBXTargetDependency */,
-                               D41257E41E941A8400781F23 /* PBXTargetDependency */,
                        );
                        name = trustd_ios;
                        productName = trustd_ios;
                        productReference = DC0BCD481D8C694700070CB0 /* libutilitiesRegressions.a */;
                        productType = "com.apple.product-type.library.static";
                };
-               DC1785041D77873100B50D50 /* copyHeadersToSystem */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = DC17850A1D77873200B50D50 /* Build configuration list for PBXNativeTarget "copyHeadersToSystem" */;
-                       buildPhases = (
-                               DC1785021D77873100B50D50 /* Headers */,
-                               DC1785031D77873100B50D50 /* Resources */,
-                               DC17886F1D77934100B50D50 /* Copy SecurityObjectSync Headers */,
-                               DC1788D81D7793C000B50D50 /* Unifdef RC_HIDE_J79/J80 */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                       );
-                       name = copyHeadersToSystem;
-                       productName = copyHeadersToSystem;
-                       productReference = DC1785051D77873100B50D50 /* Security.framework */;
-                       productType = "com.apple.product-type.framework";
-               };
                DC1789031D77980500B50D50 /* Security_osx */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = DC17890D1D77980500B50D50 /* Build configuration list for PBXNativeTarget "Security_osx" */;
                        buildPhases = (
+                               DC1789011D77980500B50D50 /* Headers */,
+                               DCF7F5D11F69AC28001042E9 /* Copy SecureObjectSync Headers */,
                                DC1788FF1D77980500B50D50 /* Sources */,
                                DC1789001D77980500B50D50 /* Frameworks */,
-                               DC1789011D77980500B50D50 /* Headers */,
                                DC1789A71D779E7E00B50D50 /* Run Script Generate Strings */,
                                DC1789021D77980500B50D50 /* Resources */,
                                DC1789E81D77A0E700B50D50 /* CopyFiles */,
                        );
                        dependencies = (
                                DCD8A1FE1E09FA1800E4FA0A /* PBXTargetDependency */,
-                               DC0B62961D90B6DB00D43BCB /* PBXTargetDependency */,
                                DCC5BF381D937329008D1E84 /* PBXTargetDependency */,
                                DC1789791D779C6700B50D50 /* PBXTargetDependency */,
-                               DC59EA791D91CC78001BDDF5 /* PBXTargetDependency */,
                                DC0BCDB71D8C6AD100070CB0 /* PBXTargetDependency */,
                                DCB340191D8A248C0054D16E /* PBXTargetDependency */,
                                DCD66DC31D82056C00DB1393 /* PBXTargetDependency */,
                                DC222C381E034D1F00B09171 /* Sources */,
                                DC222C631E034D1F00B09171 /* Frameworks */,
                                DC222C641E034D1F00B09171 /* Headers */,
-                               6C0B0C481E2537E2007F95E5 /* CopyFiles */,
                        );
                        buildRules = (
+                               DC9FD3221F85877000C8AAC8 /* PBXBuildRule */,
                        );
                        dependencies = (
                        );
                        buildRules = (
                        );
                        dependencies = (
-                               DC3502C71E020D5600BC0587 /* PBXTargetDependency */,
                                DC3502C41E020D4D00BC0587 /* PBXTargetDependency */,
                                DC3502CE1E020E2200BC0587 /* PBXTargetDependency */,
                                DC0984F71E1DB6D400140ADC /* PBXTargetDependency */,
                                6C0B0C4A1E253840007F95E5 /* CopyFiles */,
                        );
                        buildRules = (
+                               DC9FD3201F85818000C8AAC8 /* PBXBuildRule */,
                        );
                        dependencies = (
                        );
                        productReference = DC58C4231D77BDEA003C25A4 /* csparser.bundle */;
                        productType = "com.apple.product-type.bundle";
                };
-               DC59E9AC1D91C9DC001BDDF5 /* DER_not_installed */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = DC59E9E91D91C9DC001BDDF5 /* Build configuration list for PBXNativeTarget "DER_not_installed" */;
-                       buildPhases = (
-                               DC71DA011D95BD670065FB93 /* Why is this here? */,
-                               DC59E9AD1D91C9DC001BDDF5 /* Headers */,
-                               DC59E9D01D91C9DC001BDDF5 /* Sources */,
-                               DC59E9E81D91C9DC001BDDF5 /* Frameworks */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                       );
-                       name = DER_not_installed;
-                       productName = libsecurityd_client_macos;
-                       productReference = DC59E9EC1D91C9DC001BDDF5 /* libDER_not_installed.a */;
-                       productType = "com.apple.product-type.library.static";
-               };
-               DC59EA0E1D91CA15001BDDF5 /* DERUtils */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = DC59EA221D91CA15001BDDF5 /* Build configuration list for PBXNativeTarget "DERUtils" */;
-                       buildPhases = (
-                               DC59EA0F1D91CA15001BDDF5 /* Headers */,
-                               DC59EA1A1D91CA15001BDDF5 /* Sources */,
-                               DC59EA211D91CA15001BDDF5 /* Frameworks */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                       );
-                       name = DERUtils;
-                       productName = libsecurityd_client_macos;
-                       productReference = DC59EA251D91CA15001BDDF5 /* libDERUtils.a */;
-                       productType = "com.apple.product-type.library.static";
-               };
-               DC59EA361D91CA82001BDDF5 /* parseCert */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = DC59EA3B1D91CA82001BDDF5 /* Build configuration list for PBXNativeTarget "parseCert" */;
-                       buildPhases = (
-                               DC59EA331D91CA82001BDDF5 /* Sources */,
-                               DC59EA341D91CA82001BDDF5 /* Frameworks */,
-                               DC59EA351D91CA82001BDDF5 /* CopyFiles */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                               DC59EA431D91CAAE001BDDF5 /* PBXTargetDependency */,
-                               DC59EA411D91CAAA001BDDF5 /* PBXTargetDependency */,
-                       );
-                       name = parseCert;
-                       productName = parseCert;
-                       productReference = DC59EA371D91CA82001BDDF5 /* parseCert */;
-                       productType = "com.apple.product-type.tool";
-               };
-               DC59EA521D91CAF0001BDDF5 /* parseCrl */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = DC59EA5D1D91CAF0001BDDF5 /* Build configuration list for PBXNativeTarget "parseCrl" */;
-                       buildPhases = (
-                               DC59EA571D91CAF0001BDDF5 /* Sources */,
-                               DC59EA591D91CAF0001BDDF5 /* Frameworks */,
-                               DC59EA5C1D91CAF0001BDDF5 /* CopyFiles */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                               DC59EA531D91CAF0001BDDF5 /* PBXTargetDependency */,
-                               DC59EA551D91CAF0001BDDF5 /* PBXTargetDependency */,
-                       );
-                       name = parseCrl;
-                       productName = parseCert;
-                       productReference = DC59EA601D91CAF0001BDDF5 /* parseCrl */;
-                       productType = "com.apple.product-type.tool";
-               };
-               DC59EA621D91CB9F001BDDF5 /* parseTicket */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = DC59EA6D1D91CB9F001BDDF5 /* Build configuration list for PBXNativeTarget "parseTicket" */;
-                       buildPhases = (
-                               DC59EA671D91CB9F001BDDF5 /* Sources */,
-                               DC59EA691D91CB9F001BDDF5 /* Frameworks */,
-                               DC59EA6C1D91CB9F001BDDF5 /* CopyFiles */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                               DC59EA651D91CB9F001BDDF5 /* PBXTargetDependency */,
-                       );
-                       name = parseTicket;
-                       productName = parseCert;
-                       productReference = DC59EA701D91CB9F001BDDF5 /* parseTicket */;
-                       productType = "com.apple.product-type.tool";
-               };
                DC5ABDC41D832DAB00CF422C /* securitytool_macos */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = DC5ABDC91D832DAB00CF422C /* Build configuration list for PBXNativeTarget "securitytool_macos" */;
                        dependencies = (
                                DC0BB4441ED4D74A0035F886 /* PBXTargetDependency */,
                                DC65E7601D8CB4A300152EF0 /* PBXTargetDependency */,
-                               DC59EA931D91CDD6001BDDF5 /* PBXTargetDependency */,
                                DC65E7621D8CB4AA00152EF0 /* PBXTargetDependency */,
                                DC00ABE21D821F6000513D74 /* PBXTargetDependency */,
                                DC00ABE01D821F5C00513D74 /* PBXTargetDependency */,
                                D40B6A921E2B678D00CD6EE5 /* PBXTargetDependency */,
                                DC00ABE41D821F6200513D74 /* PBXTargetDependency */,
                                DCD22D671D8CC387001C9B81 /* PBXTargetDependency */,
+                               DCB332471F47857D00178C30 /* PBXTargetDependency */,
                                DC65E7641D8CB4B100152EF0 /* PBXTargetDependency */,
                                DCD22D691D8CC3A6001C9B81 /* PBXTargetDependency */,
                        );
                        productReference = DC71D9DF1D95BA6C0065FB93 /* libASN1.a */;
                        productType = "com.apple.product-type.library.static";
                };
-               DC71D9E41D95BB0A0065FB93 /* DER */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = DC71D9F81D95BB0A0065FB93 /* Build configuration list for PBXNativeTarget "DER" */;
-                       buildPhases = (
-                               DC71DA001D95BD320065FB93 /* Why is this here? */,
-                               DC71D9E51D95BB0A0065FB93 /* Headers */,
-                               DC71D9F01D95BB0A0065FB93 /* Sources */,
-                               DC71D9F71D95BB0A0065FB93 /* Frameworks */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                       );
-                       name = DER;
-                       productName = libsecurityd_client_macos;
-                       productReference = DC71D9FB1D95BB0A0065FB93 /* libDER.a */;
-                       productType = "com.apple.product-type.library.static";
-               };
                DC8834011D8A218F00CE0ACA /* ASN1_not_installed */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = DC8834051D8A218F00CE0ACA /* Build configuration list for PBXNativeTarget "ASN1_not_installed" */;
                        buildRules = (
                        );
                        dependencies = (
-                               DC59EA991D91CE8C001BDDF5 /* PBXTargetDependency */,
                        );
                        name = security_keychain;
                        productName = libsecurityd_client_macos;
                        );
                        dependencies = (
                                DC65E7541D8CB46100152EF0 /* PBXTargetDependency */,
-                               DC59EA8A1D91CD89001BDDF5 /* PBXTargetDependency */,
+                               DC2671101F3E933700816EED /* PBXTargetDependency */,
                                DC52EE631D80D7D900B0A59C /* PBXTargetDependency */,
                                DCB345B31D8A361F0054D16E /* PBXTargetDependency */,
                                DC63CAFA1D91A16700C03317 /* PBXTargetDependency */,
                        buildRules = (
                        );
                        dependencies = (
-                               DC59EA961D91CDEE001BDDF5 /* PBXTargetDependency */,
                                DC65E7661D8CB4C200152EF0 /* PBXTargetDependency */,
                                DC65E7681D8CB4CB00152EF0 /* PBXTargetDependency */,
                                DCE4E7D81D7A4B3500AFB96E /* PBXTargetDependency */,
                        );
                        dependencies = (
                                DCD8A2071E09FB1F00E4FA0A /* PBXTargetDependency */,
-                               DC71DA091D95BEE00065FB93 /* PBXTargetDependency */,
                                DC71DA031D95BDEA0065FB93 /* PBXTargetDependency */,
                                DC00AB721D821C4600513D74 /* PBXTargetDependency */,
                                DC00AB741D821C4800513D74 /* PBXTargetDependency */,
                        );
                        dependencies = (
                                D40B6A811E2B5F4700CD6EE5 /* PBXTargetDependency */,
-                               DC71DA0B1D95BEF60065FB93 /* PBXTargetDependency */,
                                DC71DA051D95BDF90065FB93 /* PBXTargetDependency */,
                                DC65E72C1D8CB31200152EF0 /* PBXTargetDependency */,
                        );
                        buildRules = (
                        );
                        dependencies = (
-                               DC59EA871D91CD76001BDDF5 /* PBXTargetDependency */,
                                DC00ABBB1D821E9B00513D74 /* PBXTargetDependency */,
                                DC00ABBD1D821E9F00513D74 /* PBXTargetDependency */,
                                DCD8A1F51E09F91F00E4FA0A /* PBXTargetDependency */,
                                DC00AB9E1D821DBB00513D74 /* PBXTargetDependency */,
                                DCD8A1F81E09F97300E4FA0A /* PBXTargetDependency */,
                                DC65E7401D8CB3CD00152EF0 /* PBXTargetDependency */,
-                               DC59EA811D91CD16001BDDF5 /* PBXTargetDependency */,
                                DC65E7421D8CB3D400152EF0 /* PBXTargetDependency */,
                        );
                        name = KeychainCircleTests;
                                EBFBC2B41E76586700A34469 /* PBXTargetDependency */,
                                EBFBC2B61E76587800A34469 /* PBXTargetDependency */,
                                EB108F1F1E6CE4D2003B0456 /* PBXTargetDependency */,
-                               EBFBC2B81E76588200A34469 /* PBXTargetDependency */,
                                EBFBC2BA1E76588A00A34469 /* PBXTargetDependency */,
                        );
                        name = KCPairingTests;
                        productReference = EB433A281CC3243600A7EACE /* secitemstresstest */;
                        productType = "com.apple.product-type.tool";
                };
+               EB49B2AD202D877F003F34A0 /* secdmockaks */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = EB49B2BA202D8780003F34A0 /* Build configuration list for PBXNativeTarget "secdmockaks" */;
+                       buildPhases = (
+                               EB49B2AA202D877F003F34A0 /* Sources */,
+                               EB49B2AB202D877F003F34A0 /* Frameworks */,
+                               EB49B30E202FF484003F34A0 /* Embedded OCMock */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = secdmockaks;
+                       productName = secdmockaks;
+                       productReference = EB49B2AE202D877F003F34A0 /* secdmockaks.xctest */;
+                       productType = "com.apple.product-type.bundle.unit-test";
+               };
                EB9C1D791BDFD0E000F89272 /* secbackupntest */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = EB9C1DA91BDFD0E100F89272 /* Build configuration list for PBXNativeTarget "secbackupntest" */;
                        buildRules = (
                        );
                        dependencies = (
+                               DCE5DC171EA804E5006308A6 /* PBXTargetDependency */,
                                0C10C93C1DD548BD000602A8 /* PBXTargetDependency */,
                                0C10C93A1DD548B6000602A8 /* PBXTargetDependency */,
                        );
                                                CreatedOnToolsVersion = 9.0;
                                                ProvisioningStyle = Automatic;
                                        };
+                                       4727FBB61F9918580003AE36 = {
+                                               CreatedOnToolsVersion = 9.1;
+                                               ProvisioningStyle = Automatic;
+                                       };
                                        47702B1D1E5F409700B29577 = {
                                                CreatedOnToolsVersion = 9.0;
                                                ProvisioningStyle = Automatic;
                                                CreatedOnToolsVersion = 9.0;
                                                ProvisioningStyle = Automatic;
                                        };
+                                       478D426C1FD72A8100CAB645 = {
+                                               ProvisioningStyle = Automatic;
+                                       };
                                        47C51B831EEA657D0032D9E5 = {
                                                CreatedOnToolsVersion = 9.0;
                                        };
                                        6C9808681E788AFD00E70590 = {
                                                TestTargetID = 6CF4A0DF1E4549F200ECD7B5;
                                        };
+                                       6C9AA79D1F7C1D8F00D08296 = {
+                                               CreatedOnToolsVersion = 9.0;
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       6CAA8D1F1F842FB3007B6E03 = {
+                                               CreatedOnToolsVersion = 9.0;
+                                               ProvisioningStyle = Automatic;
+                                       };
                                        6CCDF7831E3C25FA003F2555 = {
                                                CreatedOnToolsVersion = 8.3;
                                                ProvisioningStyle = Automatic;
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        };
-                                       DC1785041D77873100B50D50 = {
-                                               CreatedOnToolsVersion = 8.0;
-                                               ProvisioningStyle = Automatic;
-                                       };
                                        DC1789031D77980500B50D50 = {
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        };
-                                       DC59EA361D91CA82001BDDF5 = {
-                                               CreatedOnToolsVersion = 8.0;
-                                               ProvisioningStyle = Automatic;
-                                       };
                                        DC5ABDC41D832DAB00CF422C = {
                                                CreatedOnToolsVersion = 8.0;
                                                DevelopmentTeam = XPSUQMMH5W;
                                                CreatedOnToolsVersion = 8.3;
                                                ProvisioningStyle = Automatic;
                                        };
+                                       EB49B2AD202D877F003F34A0 = {
+                                               CreatedOnToolsVersion = 9.3;
+                                               ProvisioningStyle = Automatic;
+                                       };
                                        EB6A6FA81B90F83A0045DC68 = {
                                                CreatedOnToolsVersion = 7.0;
                                        };
                                DC8E04991D7F6D9C006D80EB /* ====== Frameworks ======== */,
                                4C32C0AE0A4975F6002891BD /* Security_ios */,
                                DC1789031D77980500B50D50 /* Security_osx */,
-                               DC1785041D77873100B50D50 /* copyHeadersToSystem */,
                                E7D847C41C6BE9710025BB44 /* KeychainCircle */,
                                BEF88C271EAFFC3F00357577 /* TrustedPeers */,
                                DC8E04911D7F6CED006D80EB /* ======= Daemons ========= */,
                                DCE4E7F51D7A4DA800AFB96E /* secd */,
                                790851B50CA9859F0083CC4D /* securityd_ios */,
                                DC5AC04F1D8352D900CF422C /* securityd_macos */,
+                               6CAA8D1F1F842FB3007B6E03 /* securityuploadd */,
                                D41257CE1E9410A300781F23 /* trustd_ios */,
                                DCE4E82D1D7A57AE00AFB96E /* trustd_macos */,
                                52D82BDD16A621F70078DFE5 /* CloudKeychainProxy */,
                                225394AC1E3080A600D3CD9B /* security_codesigning_ios */,
                                DC8834011D8A218F00CE0ACA /* ASN1_not_installed */,
                                DC71D99F1D95BA6C0065FB93 /* ASN1 */,
-                               DC59E9AC1D91C9DC001BDDF5 /* DER_not_installed */,
-                               DC71D9E41D95BB0A0065FB93 /* DER */,
-                               DC59EA0E1D91CA15001BDDF5 /* DERUtils */,
                                DCF782BA1D88B44300E694BB /* ==== macOS Libraries ====== */,
                                DCF7830A1D88B4DE00E694BB /* security_apple_csp */,
                                DCF785021D88B95500E694BB /* security_apple_cspdl */,
                                4C52D0B316EFC61E0079966E /* CircleJoinRequested */,
                                F93C49021AB8FCE00047E01A /* ckcdiagnose.sh */,
                                EBF374711DC055580065D840 /* security-sysdiagnose */,
+                               6C9AA79D1F7C1D8F00D08296 /* supdctl */,
                                EB27FF101E402CD300EC9E3A /* ckksctl */,
                                F621D0271ED6DCE7000EA569 /* authorizationdump */,
+                               0C8BBEFD1FCB446400580909 /* otctl */,
                                DC8E04A11D7F6DFC006D80EB /* ======= Apps ========== */,
                                DCE4E9101D7F3D5300AFB96E /* Keychain Circle Notification */,
                                DCE4E8DC1D7F39DB00AFB96E /* Cloud Keychain Utility */,
                                E710C7411331946400F85568 /* SecurityTests */,
                                DCE4E7311D7A43B500AFB96E /* SecurityTestsOSX */,
                                DC3502B41E0208BE00BC0587 /* CKKSTests */,
+                               0C85DFD11FB38BB6000343A7 /* OTTests */,
                                DC610AAD1D7910C3002223DE /* gk_reset_check_macos */,
                                DC610A551D78F9D2002223DE /* codesign_tests_macos */,
                                DC610A461D78F48F002223DE /* SecTaskTest_macos */,
                                7913B1FF0D172B3900601FE9 /* sslServer */,
                                4C9DE9D11181AC4800CF5C27 /* sslEcdsa */,
                                4CE5A54C09C796E100D27A3F /* sslViewer */,
-                               DC59EA361D91CA82001BDDF5 /* parseCert */,
-                               DC59EA521D91CAF0001BDDF5 /* parseCrl */,
-                               DC59EA621D91CB9F001BDDF5 /* parseTicket */,
                                DC0BC5C51D8B72E700070CB0 /* test-checkpw */,
                                DC0BC5D51D8B73B000070CB0 /* perf-checkpw */,
                                6C98082C1E788AEB00E70590 /* CKKSCloudKitTests_mac */,
                                6CF4A0B31E45488B00ECD7B5 /* KeychainEntitledTestApp_mac */,
                                6CF4A0DF1E4549F200ECD7B5 /* KeychainEntitledTestApp_ios */,
                                6CCDF7831E3C25FA003F2555 /* KeychainEntitledTestRunner */,
+                               6C46056B1F882B9B001421B6 /* KeychainAnalyticsTests */,
                                DC5AC1351D835D9700CF422C /* ===== Source Gen ===== */,
                                DC008B451D90CE53004002A3 /* securityd_macos_mig */,
                                DC6BC26C1D90CFEF00DD57B3 /* securityd_macos_startup */,
                                DCD0675B1D8CDD6D007602F1 /* codesigning_SystemPolicy */,
                                DC8E04AD1D7F6E76006D80EB /* ======= misc ========= */,
                                E7B01BBD166594AB000485F1 /* SyncDevTest2 */,
-                               728B56A016D59979008FA3AB /* OTAPKIAssetTool */,
                                5E10992419A5E55800A60E2B /* ISACLProtectedItems */,
                                5346480017331E1100FE9172 /* KeychainSyncAccountNotification */,
                                DA30D6751DF8C8FB00EC6B43 /* KeychainSyncAccountUpdater */,
                                05EF68B519491512007958C3 /* Security_frameworks */,
                                F667EC561E96E9B100203D5C /* authdtest */,
                                47C51B831EEA657D0032D9E5 /* SecurityUnitTests */,
+                               4727FBB61F9918580003AE36 /* secdxctests_ios */,
+                               478D426C1FD72A8100CAB645 /* secdxctests_mac */,
+                               EB49B2AD202D877F003F34A0 /* secdmockaks */,
                        );
                };
 /* End PBXProject section */
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
+               4727FBB51F9918580003AE36 /* Resources */ = {
+                       isa = PBXResourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               478D42981FD72A8100CAB645 /* Resources */ = {
+                       isa = PBXResourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                47C51B821EEA657D0032D9E5 /* Resources */ = {
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               D4C263CF1F953019001317EA /* SecDebugErrorMessages.strings in Resources */,
+                               D4C263CE1F95300F001317EA /* SecErrorMessages.strings in Resources */,
+                               BEB9EA2F1FFF1AF700676593 /* si-88-sectrust-valid-data in Resources */,
+                               47922D4F1FAA7D5C0008F7E0 /* SecDbKeychainSerializedItemV7.proto in Resources */,
                                53C0E1FF177FB48A00F8A018 /* CloudKeychain.strings in Resources */,
                                BE4AC9BA18B8273600B84964 /* SharedWebCredentials.strings in Resources */,
                                DCEE1E861D93427400DC0EB7 /* com.apple.securityd.plist in Resources */,
+                               47922D211FAA76000008F7E0 /* SecDbKeychainSerializedMetadata.proto in Resources */,
                                EB433A2E1CC325E900A7EACE /* secitemstresstest.entitlements in Resources */,
-                               475F37201EE8F23900248FB5 /* SFAnalyticsLogging.plist in Resources */,
+                               47922D2D1FAA77970008F7E0 /* SecDbKeychainSerializedSecretData.proto in Resources */,
+                               475F37201EE8F23900248FB5 /* SFAnalytics.plist in Resources */,
                                4C198F220ACDB4BF00AAB142 /* Certificate.strings in Resources */,
                                4C198F230ACDB4BF00AAB142 /* OID.strings in Resources */,
+                               D479F6E21F980FAB00388D28 /* Trust.strings in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                D4AA64861E97273D00D317ED /* si-18-certificate-parse in Resources */,
                                D4EC94FB1CEA482D0083E753 /* si-20-sectrust-policies-data in Resources */,
                                0C0C88781CCEC5C400617D1B /* si-82-sectrust-ct-data in Resources */,
+                               D4C6C5CA1FB2AD7A007EA57E /* si-87-sectrust-name-constraints in Resources */,
+                               BEA74217202525DC00EC7993 /* si-88-sectrust-valid-data in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               DC1785031D77873100B50D50 /* Resources */ = {
-                       isa = PBXResourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                DC1789021D77980500B50D50 /* Resources */ = {
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                                DC178A2F1D77A1E700B50D50 /* sd_cspdl_common.mdsinfo in Resources */,
                                DC178A291D77A1E700B50D50 /* dl_primary.mdsinfo in Resources */,
                                DC178A261D77A1E700B50D50 /* cspdl_csp_primary.mdsinfo in Resources */,
-                               475F37211EE8F23900248FB5 /* SFAnalyticsLogging.plist in Resources */,
+                               475F37211EE8F23900248FB5 /* SFAnalytics.plist in Resources */,
                                DC178A221D77A1E700B50D50 /* csp_common.mdsinfo in Resources */,
                                DC178A431D77A1F600B50D50 /* SecDebugErrorMessages.strings in Resources */,
                                DC178A481D77A1F600B50D50 /* TimeStampingPrefs.plist in Resources */,
                                DCE4E76F1D7A43B500AFB96E /* si-20-sectrust-policies-data in Resources */,
                                DCE4E7701D7A43B500AFB96E /* si-82-sectrust-ct-data in Resources */,
                                DCE4E7B41D7A43DC00AFB96E /* si-82-sectrust-ct-logs.plist in Resources */,
+                               D4C6C5C81FB2AD5E007EA57E /* si-87-sectrust-name-constraints in Resources */,
+                               BEB9EA301FFF1B0800676593 /* si-88-sectrust-valid-data in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                D4AA64871E97274900D317ED /* si-18-certificate-parse in Resources */,
                                D4EC94FE1CEA48760083E753 /* si-20-sectrust-policies-data in Resources */,
                                0C0C88791CCEC5C500617D1B /* si-82-sectrust-ct-data in Resources */,
+                               D4C6C5C91FB2AD6D007EA57E /* si-87-sectrust-name-constraints in Resources */,
+                               BEA74211202525CD00EC7993 /* si-88-sectrust-valid-data in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-               22C002A21AC9D2D100B3469E /* ShellScript */ = {
+               0C85DFFF1FB38BB6000343A7 /* ShellScript */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;
-                       shellScript = "if [ -n \"${OTAPKIASSETTOOL_LAUNCHD_PLIST}\" ]; then\n    mkdir -p \"$LAUNCHD_PLIST_INSTALL_DIR\"\n    plutil -convert binary1 -o \"$LAUNCHD_PLIST_INSTALL_DIR/com.apple.OTAPKIAssetTool.plist\" \"$OTAPKIASSETTOOL_LAUNCHD_PLIST\"\nfi";
-                       showEnvVarsInLog = 0;
+                       shellScript = "#Disable until this places a plist in this directory\n#chown -f root:wheel ${DSTROOT}/AppleInternal/CoreOS/BATS/unit_tests/*.plist";
                };
                5EE098DE1CD21661009FCA27 /* Unifdef RC_HIDE_J79/J80 */ = {
                        isa = PBXShellScriptBuildPhase;
                        shellScript = "if [ -d $DSTROOT ]; then\n    RC_HIDE_J79_VAL=0\n    RC_HIDE_J80_VAL=0\n    SEC_HDRS_PATH=\"System/Library/Frameworks/Security.framework/Headers\"\n\n    if [ ! -z $RC_HIDE_J79 ]; then\n        RC_HIDE_J79_VAL=1\n    fi\n\n    if [ ! -z $RC_HIDE_J80 ]; then\n        RC_HIDE_J80_VAL=1\n    fi\n\n    if [ -a $DSTROOT/$SEC_HDRS_PATH/SecAccessControl.h ]; then\n        unifdef -B -DRC_HIDE_J79=$RC_HIDE_J79_VAL -DRC_HIDE_J80=$RC_HIDE_J80_VAL -o $DSTROOT/$SEC_HDRS_PATH/SecAccessControl.h $DSTROOT/$SEC_HDRS_PATH/SecAccessControl.h\n        if [$? eq 2]; then\n            exit 2\n        fi\n    fi\n\n    if [ -a $DSTROOT/$SEC_HDRS_PATH/SecItem.h ]; then\n        unifdef -B -DRC_HIDE_J79=$RC_HIDE_J79_VAL -DRC_HIDE_J80=$RC_HIDE_J80_VAL -o $DSTROOT/$SEC_HDRS_PATH/SecItem.h $DSTROOT/$SEC_HDRS_PATH/SecItem.h\n        if [$? eq 2]; then\n            exit 2\n        fi\n    fi\n\n    exit 0\nfi";
                        showEnvVarsInLog = 0;
                };
+               6CAA8D361F84317F007B6E03 /* Install launchd plist */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 8;
+                       files = (
+                       );
+                       inputPaths = (
+                       );
+                       name = "Install launchd plist";
+                       outputPaths = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+                       shellPath = /bin/sh;
+                       shellScript = "mkdir -p \"$LAUNCHD_PLIST_LOCATION\"\nplutil -convert binary1 -o \"$LAUNCHD_PLIST_LOCATION/com.apple.securityuploadd.plist\" \"$LAUNCHD_PLIST\"";
+               };
                6CB5F4761E402D0000DBF3F0 /* ShellScript */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        shellPath = /bin/sh;
                        shellScript = "PLIST_FILE_NAME=com.apple.security.cloudkeychainproxy3\nFILE_TO_COPY=${PROJECT_DIR}/KVSKeychainSyncingProxy/${PLIST_FILE_NAME}.ios.plist\n\nif [ ${PLATFORM_NAME} = \"macosx\" ]\nthen\nFILE_TO_COPY=${PROJECT_DIR}/KVSKeychainSyncingProxy/${PLIST_FILE_NAME}.osx.plist\nfi\n\ncp ${FILE_TO_COPY} ${INSTALL_ROOT}/${INSTALL_DAEMON_AGENT_DIR}/${PLIST_FILE_NAME}.plist";
                };
+               D4C263C41F8FEAA8001317EA /* Run Script Generate Error Strings */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       inputPaths = (
+                               "${BUILT_PRODUCTS_DIR}/Security.framework/Headers/SecBase.h",
+                               "${BUILT_PRODUCTS_DIR}/Security.framework/Headers/SecureTransport.h",
+                               "${BUILT_PRODUCTS_DIR}/Security.framework/PrivateHeaders/CSCommon.h",
+                       );
+                       name = "Run Script Generate Error Strings";
+                       outputPaths = (
+                               "${BUILT_PRODUCTS_DIR}/derived_src/SecDebugErrorMessages.strings",
+                               "${BUILT_PRODUCTS_DIR}/derived_src/English.lproj/SecErrorMessages.strings",
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+                       shellPath = /bin/sh;
+                       shellScript = "set -x\n\nDERIVED_SRC=${BUILT_PRODUCTS_DIR}/derived_src\nmkdir -p ${DERIVED_SRC}\n\n# make error message string files\n\nGENDEBUGSTRS[0]=YES; ERRORSTRINGS[0]=${DERIVED_SRC}/SecDebugErrorMessages.strings\nGENDEBUGSTRS[1]=NO ; ERRORSTRINGS[1]=${DERIVED_SRC}/English.lproj/SecErrorMessages.strings\n\nmkdir -p ${DERIVED_SRC}/English.lproj\n\nfor ((ix=0;ix<2;ix++)) ; do\nperl OSX/lib/generateErrStrings.pl \\\n${GENDEBUGSTRS[ix]} \\\n${DERIVED_SRC} \\\n${ERRORSTRINGS[ix]} \\\n${BUILT_PRODUCTS_DIR}/Security.framework/Headers/SecureTransport.h \\\n${BUILT_PRODUCTS_DIR}/Security.framework/Headers/SecBase.h \\\n${BUILT_PRODUCTS_DIR}/Security.framework/PrivateHeaders/CSCommon.h\ndone\n";
+               };
                DC008B581D90CE70004002A3 /* securityd mig */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                        shellPath = /bin/sh;
                        shellScript = "name=checkpw\n\nmkdir -p \"${DSTROOT}/private/etc/pam.d/\"\ncp \"${PROJECT_DIR}/OSX/libsecurity_checkpw/checkpw.pam\" \"${DSTROOT}/private/etc/pam.d/${name}\"";
                };
-               DC1788D81D7793C000B50D50 /* Unifdef RC_HIDE_J79/J80 */ = {
-                       isa = PBXShellScriptBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       inputPaths = (
-                       );
-                       name = "Unifdef RC_HIDE_J79/J80";
-                       outputPaths = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-                       shellPath = /bin/sh;
-                       shellScript = "if [ -d $DSTROOT ]; then\nRC_HIDE_J79_VAL=0\nRC_HIDE_J80_VAL=0\nSEC_HDRS_PATH=\"System/Library/Frameworks/Security.framework/Headers\"\n\nif [ ! -z $RC_HIDE_J79 ]; then\nRC_HIDE_J79_VAL=1\nfi\n\nif [ ! -z $RC_HIDE_J80 ]; then\nRC_HIDE_J80_VAL=1\nfi\n\nif [ -a $DSTROOT/$SEC_HDRS_PATH/SecAccessControl.h ]; then\nunifdef -B -DRC_HIDE_J79=$RC_HIDE_J79_VAL -DRC_HIDE_J80=$RC_HIDE_J80_VAL -o $DSTROOT/$SEC_HDRS_PATH/SecAccessControl.h $DSTROOT/$SEC_HDRS_PATH/SecAccessControl.h\nif [$? eq 2]; then\nexit 2\nfi\nfi\n\nif [ -a $DSTROOT/$SEC_HDRS_PATH/SecItem.h ]; then\nunifdef -B -DRC_HIDE_J79=$RC_HIDE_J79_VAL -DRC_HIDE_J80=$RC_HIDE_J80_VAL -o $DSTROOT/$SEC_HDRS_PATH/SecItem.h $DSTROOT/$SEC_HDRS_PATH/SecItem.h\nif [$? eq 2]; then\nexit 2\nfi\nfi\n\nexit 0\nfi";
-                       showEnvVarsInLog = 0;
-               };
                DC1789A71D779E7E00B50D50 /* Run Script Generate Strings */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                                "${BUILT_PRODUCTS_DIR}/Security.framework/Headers/AuthSession.h",
                                "${BUILT_PRODUCTS_DIR}/Security.framework/Headers/SecureTransport.h",
                                "${BUILT_PRODUCTS_DIR}/Security.framework/Headers/SecBase.h",
-                               "${BUILT_PRODUCTS_DIR}/Security.framework/Headers/cssmerr.h",
                                "${BUILT_PRODUCTS_DIR}/Security.framework/Headers/cssmapple.h",
                                "${BUILT_PRODUCTS_DIR}/Security.framework/Headers/CSCommon.h",
-                               "${BUILT_PRODUCTS_DIR}/Security.framework/PrivateHeaders/AuthorizationPriv.h",
                                "${PROJECT_DIR}/libsecurity_keychain/lib/MacOSErrorStrings.h",
-                               "${BUILT_PRODUCTS_DIR}/Security.framework/PrivateHeaders/SecureTransportPriv.h",
+                               "${BUILT_PRODUCTS_DIR}/Security.framework/Headers/cssmerr.h",
                        );
                        name = "Run Script Generate Strings";
                        outputPaths = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "set -x\n\nDERIVED_SRC=${BUILT_PRODUCTS_DIR}/derived_src\nmkdir -p ${DERIVED_SRC}\n\n# make error message string files\n\nGENDEBUGSTRS[0]=YES; ERRORSTRINGS[0]=${DERIVED_SRC}/SecDebugErrorMessages.strings\nGENDEBUGSTRS[1]=NO ; ERRORSTRINGS[1]=${DERIVED_SRC}/en.lproj/SecErrorMessages.strings\n\nmkdir -p ${DERIVED_SRC}/en.lproj\n\nfor ((ix=0;ix<2;ix++)) ; do\nperl OSX/lib/generateErrStrings.pl \\\n${GENDEBUGSTRS[ix]} \\\n${DERIVED_SRC} \\\n${ERRORSTRINGS[ix]} \\\n${BUILT_PRODUCTS_DIR}/Security.framework/Headers/Authorization.h \\\n${BUILT_PRODUCTS_DIR}/Security.framework/Headers/AuthSession.h \\\n${BUILT_PRODUCTS_DIR}/Security.framework/Headers/SecureTransport.h \\\n${BUILT_PRODUCTS_DIR}/Security.framework/Headers/SecBase.h \\\n${BUILT_PRODUCTS_DIR}/Security.framework/Headers/cssmerr.h \\\n${BUILT_PRODUCTS_DIR}/Security.framework/Headers/cssmapple.h \\\n${BUILT_PRODUCTS_DIR}/Security.framework/Headers/CSCommon.h \\\n${BUILT_PRODUCTS_DIR}/Security.framework/PrivateHeaders/AuthorizationPriv.h \\\n${PROJECT_DIR}/OSX/libsecurity_keychain/lib/MacOSErrorStrings.h \\\n${BUILT_PRODUCTS_DIR}/Security.framework/PrivateHeaders/SecureTransportPriv.h\ndone\n";
+                       shellScript = "set -x\n\nDERIVED_SRC=${BUILT_PRODUCTS_DIR}/derived_src\nmkdir -p ${DERIVED_SRC}\n\n# make error message string files\n\nGENDEBUGSTRS[0]=YES; ERRORSTRINGS[0]=${DERIVED_SRC}/SecDebugErrorMessages.strings\nGENDEBUGSTRS[1]=NO ; ERRORSTRINGS[1]=${DERIVED_SRC}/en.lproj/SecErrorMessages.strings\n\nmkdir -p ${DERIVED_SRC}/en.lproj\n\nfor ((ix=0;ix<2;ix++)) ; do\nperl OSX/lib/generateErrStrings.pl \\\n${GENDEBUGSTRS[ix]} \\\n${DERIVED_SRC} \\\n${ERRORSTRINGS[ix]} \\\n${BUILT_PRODUCTS_DIR}/Security.framework/Headers/Authorization.h \\\n${BUILT_PRODUCTS_DIR}/Security.framework/Headers/AuthSession.h \\\n${BUILT_PRODUCTS_DIR}/Security.framework/Headers/SecureTransport.h \\\n${BUILT_PRODUCTS_DIR}/Security.framework/Headers/SecBase.h \\\n${BUILT_PRODUCTS_DIR}/Security.framework/Headers/cssmerr.h \\\n${BUILT_PRODUCTS_DIR}/Security.framework/Headers/cssmapple.h \\\n${BUILT_PRODUCTS_DIR}/Security.framework/Headers/CSCommon.h \\\n${PROJECT_DIR}/OSX/libsecurity_keychain/lib/MacOSErrorStrings.h\ndone\n";
                };
                DC178B481D77A51600B50D50 /* Make XPC server symlink */ = {
                        isa = PBXShellScriptBuildPhase;
                        shellScript = "# The build system requires that we don't install these headers and .as in multiple phases.\n# This target will not install anything, so feel free to depend on it whenever you use it.\n\n# If you make changes to this target, please make them to ASN1 as well.";
                        showEnvVarsInLog = 0;
                };
-               DC71DA001D95BD320065FB93 /* Why is this here? */ = {
-                       isa = PBXShellScriptBuildPhase;
-                       buildActionMask = 8;
-                       files = (
-                       );
-                       inputPaths = (
-                               "$(SRCROOT)/OSX/libsecurity_keychain/libDER/libDER/libDER.h",
-                       );
-                       name = "Why is this here?";
-                       outputPaths = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
-                       shellPath = /bin/sh;
-                       shellScript = "# The build system requires that we don't install these headers and .as in multiple phases. This target will install libDER (as needed per platform).\n\n# If you make changes to this target, please make them to DER_not_installed as well.";
-                       showEnvVarsInLog = 0;
-               };
-               DC71DA011D95BD670065FB93 /* Why is this here? */ = {
-                       isa = PBXShellScriptBuildPhase;
-                       buildActionMask = 8;
-                       files = (
-                       );
-                       inputPaths = (
-                               "$(SRCROOT)/OSX/libsecurity_keychain/libDER/libDER/libDER.h",
-                       );
-                       name = "Why is this here?";
-                       outputPaths = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
-                       shellPath = /bin/sh;
-                       shellScript = "# The build system requires that we don't install these headers and .as in multiple phases.\n# This target will not install anything, so feel free to depend on it whenever you use it.\n\n# If you make changes to this target, please make them to DER as well.";
-                       showEnvVarsInLog = 0;
-               };
                DC82FFE61D90D3F60085674B /* security_utilities DTrace */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
+               0C85DFE21FB38BB6000343A7 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               0CB9754F2023A8F5008D6B48 /* CloudKitMockXCTest.m in Sources */,
+                               0CB9754E2023A8DD008D6B48 /* CloudKitKeychainSyncingMockXCTest.m in Sources */,
+                               0C0DA5D01FE1F1F3003BD3BB /* CKKSControlProtocol.m in Sources */,
+                               0CBDF64D1FFC951200433E0D /* OTBottledPeerTLK.m in Sources */,
+                               0C16371C1FD116B300210823 /* MockCloudKit.m in Sources */,
+                               0C8A034F1FDF60070042E8BE /* OTBottledPeerTests.m in Sources */,
+                               0C52C1FF20003BCA003F0733 /* OTTestsBase.m in Sources */,
+                               0C1637211FD12F1500210823 /* OTCloudStoreTests.m in Sources */,
+                               0CAEC9D81FD740CF00D1F2CA /* OTContextTests.m in Sources */,
+                               0C0DA5CF1FE1F1C5003BD3BB /* OTControlProtocol.m in Sources */,
+                               0C8A03461FDF42BA0042E8BE /* OTEscrowKeyTests.m in Sources */,
+                               0C8A034D1FDF4CCE0042E8BE /* OTLocalStoreTests.m in Sources */,
+                               DCDB296C1FD8820400B5D242 /* SFAnalytics.m in Sources */,
+                               6C73F48D2006B83E003D5D63 /* SOSAnalytics.m in Sources */,
+                               0C46A57B2035019800F17112 /* OTLockStateNetworkingTests.m in Sources */,
+                               DCDB296E1FD8821400B5D242 /* SFAnalyticsActivityTracker.m in Sources */,
+                               DCDB29701FD8821800B5D242 /* SFAnalyticsMultiSampler.m in Sources */,
+                               DCDB29741FD8822200B5D242 /* SFAnalyticsSQLiteStore.m in Sources */,
+                               0C46A5712034C6BA00F17112 /* OTControl.m in Sources */,
+                               DCDB29721FD8821D00B5D242 /* SFAnalyticsSampler.m in Sources */,
+                               DCDB297E1FD8849D00B5D242 /* SFObjCType.m in Sources */,
+                               0CC0445B1FFC4150004A5B63 /* CKKSControl.m in Sources */,
+                               DCDB297C1FD8848A00B5D242 /* SFSQLite.m in Sources */,
+                               0CA4EBF4202B8DBE002B1D96 /* CloudKitKeychainSyncingTestsBase.m in Sources */,
+                               DCDB297D1FD8849A00B5D242 /* SFSQLiteStatement.m in Sources */,
+                               DCDB297B1FD8847100B5D242 /* SecTask.c in Sources */,
+                               0C1637291FD2066A00210823 /* SecdWatchdog.m in Sources */,
+                               DCDB29791FD8844C00B5D242 /* client.c in Sources */,
+                               DCDB297A1FD8845600B5D242 /* client_endpoint.m in Sources */,
+                               0CB975512023B199008D6B48 /* OTRampingTests.m in Sources */,
+                               0C16372B1FD2067F00210823 /* server_endpoint.m in Sources */,
+                               0C16372D1FD2069300210823 /* server_entitlement_helpers.c in Sources */,
+                               0C1637301FD206BC00210823 /* server_security_helpers.c in Sources */,
+                               0C1637271FD2065400210823 /* spi.c in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               0C8BBEFE1FCB446400580909 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               0C8BBF1B1FCB4EC500580909 /* OTControlProtocol.m in Sources */,
+                               0C8BBF091FCB447600580909 /* otctl.m in Sources */,
+                               0C8BBEFF1FCB446400580909 /* SecArgParse.c in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                225394AD1E3080A600D3CD9B /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                                220179EB1E3BF1F100EFB6F3 /* detachedrep.cpp in Sources */,
                                220179EA1E3BF16000EFB6F3 /* slcrep.cpp in Sources */,
                                220179E31E3BEB7100EFB6F3 /* dirscanner.cpp in Sources */,
-                               225394B71E3081F900D3CD9B /* cskernel.cpp in Sources */,
                                225394B81E30820900D3CD9B /* Code.cpp in Sources */,
                                225394B91E30821400D3CD9B /* bundlediskrep.cpp in Sources */,
                                225394BA1E30821E00D3CD9B /* cdbuilder.cpp in Sources */,
                                225394C11E30827600D3CD9B /* filediskrep.cpp in Sources */,
                                225394C21E30827E00D3CD9B /* kerneldiskrep.cpp in Sources */,
                                225394C31E30828800D3CD9B /* StaticCode.cpp in Sources */,
-                               225394C41E30829300D3CD9B /* reqparser.cpp in Sources */,
                                225394C51E3082A100D3CD9B /* requirement.cpp in Sources */,
                                225394C61E3082AB00D3CD9B /* Requirements.cpp in Sources */,
+                               DCD7EE851F4E47D2007D9804 /* reqparser.cpp in Sources */,
                                225394C71E3082B600D3CD9B /* reqdumper.cpp in Sources */,
                                225394C81E3082BE00D3CD9B /* reqinterp.cpp in Sources */,
                                225394C91E3082C900D3CD9B /* reqmaker.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
+               4727FBB31F9918580003AE36 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               47DE88DA1FA7B07400DD3254 /* server_xpc.m in Sources */,
+                               4727FBEF1F9924FB0003AE36 /* server_security_helpers.c in Sources */,
+                               4727FBEE1F9924DA0003AE36 /* server_entitlement_helpers.c in Sources */,
+                               477A1FED2037A0E000ACD81D /* KeychainXCTest.m in Sources */,
+                               4727FBEB1F99227F0003AE36 /* spi.c in Sources */,
+                               4727FBEC1F99235B0003AE36 /* SecdWatchdog.m in Sources */,
+                               4727FBBA1F9918590003AE36 /* KeychainCryptoTests.m in Sources */,
+                               477A1FE4203763A500ACD81D /* KeychainAPITests.m in Sources */,
+                               4727FBED1F99249A0003AE36 /* server_endpoint.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                47702B1A1E5F409700B29577 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
+               478D42751FD72A8100CAB645 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               478D42761FD72A8100CAB645 /* server_xpc.m in Sources */,
+                               478D42771FD72A8100CAB645 /* server_security_helpers.c in Sources */,
+                               478D42781FD72A8100CAB645 /* server_entitlement_helpers.c in Sources */,
+                               477A1FEE2037A0E000ACD81D /* KeychainXCTest.m in Sources */,
+                               478D42791FD72A8100CAB645 /* spi.c in Sources */,
+                               478D427A1FD72A8100CAB645 /* SecdWatchdog.m in Sources */,
+                               478D427B1FD72A8100CAB645 /* KeychainCryptoTests.m in Sources */,
+                               477A1FE5203763A500ACD81D /* KeychainAPITests.m in Sources */,
+                               478D427C1FD72A8100CAB645 /* server_endpoint.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                47C51B801EEA657D0032D9E5 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               6CAA8CFF1F83E800007B6E03 /* SFSQLite.m in Sources */,
+                               6CDB5FF61FA78D1B00410924 /* SFAnalyticsMultiSampler.m in Sources */,
+                               D46246A61F9AE61000D63882 /* oids.c in Sources */,
+                               0CBFEACB200FCD2D009A60E9 /* SFTransactionMetric.m in Sources */,
+                               0CBD55B31FE883F200A8CE21 /* SFBehavior.m in Sources */,
                                220179E91E3BF03200EFB6F3 /* dummy.cpp in Sources */,
+                               DC926F091F33FA8D0012A315 /* CKKSControlProtocol.m in Sources */,
                                4723C9CC1F152ED30082882F /* SFSQLiteStatement.m in Sources */,
                                DCA85B931E8D97E400BA7241 /* client.c in Sources */,
+                               6CBF653A1FA147E500A68667 /* SFAnalyticsActivityTracker.m in Sources */,
+                               DC9C95BF1F79DC88000D19E5 /* CKKSControl.m in Sources */,
+                               0C8BBF131FCB4AFA00580909 /* OTControlProtocol.m in Sources */,
+                               EB10A3E620356E2000E84270 /* OTConstants.m in Sources */,
                                18F7F67914D77F4400F88A12 /* NtlmGenerator.c in Sources */,
                                0CD8CB051ECA50780076F37F /* SOSPeerOTRTimer.m in Sources */,
                                DCA85B981E8D980A00BA7241 /* client_endpoint.m in Sources */,
+                               6CE3654E1FA100E50012F6AB /* SFAnalytics.m in Sources */,
                                18F7F67A14D77F4400F88A12 /* ntlmBlobPriv.c in Sources */,
-                               4723C9E01F1540CE0082882F /* SFAnalyticsLogger.m in Sources */,
-                               4723C9C81F152ECA0082882F /* SFSQLite.m in Sources */,
+                               6CAA8CFC1F83E7EA007B6E03 /* SFObjCType.m in Sources */,
                                E7B00700170B581D00B27966 /* Security.exp-in in Sources */,
-                               4723C9C41F152EBB0082882F /* SFObjCType.m in Sources */,
+                               0C8BBF121FCB4AAB00580909 /* OTControl.m in Sources */,
                                EB48C1A51E573EE400EC5E57 /* whoami.m in Sources */,
                                B61F67571F1FCFCB00E2FDBB /* SecPaddingConfigurations.c in Sources */,
+                               6CE365531FA101080012F6AB /* SFAnalyticsSampler.m in Sources */,
+                               6C73F48A2006B839003D5D63 /* SOSAnalytics.m in Sources */,
+                               6CE365571FA1017D0012F6AB /* SFAnalyticsSQLiteStore.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
+               6C46057A1F882B9B001421B6 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               6CB96BB21F966DA400E11457 /* SFSQLite.m in Sources */,
+                               6CB96BB31F966DA400E11457 /* SFSQLiteStatement.m in Sources */,
+                               6CBF65421FA2255800A68667 /* SFAnalyticsActivityTracker.m in Sources */,
+                               6CDF8DF21F9649AB00140B54 /* SFAnalyticsSampler.m in Sources */,
+                               6CDF8DF41F9649C000140B54 /* SFAnalytics.m in Sources */,
+                               6C4605BC1F882DB6001421B6 /* SFAnalyticsTests.m in Sources */,
+                               6C13AE471F8E9F5F00F047E3 /* supd.m in Sources */,
+                               6C4605BD1F882DC3001421B6 /* SupdTests.m in Sources */,
+                               6CDB5FFA1FA78D2500410924 /* SFAnalyticsMultiSampler.m in Sources */,
+                               6CB96BAC1F966D6500E11457 /* main.m in Sources */,
+                               6CB96BB61F966E4300E11457 /* SFObjCType.m in Sources */,
+                               6CDF8DF31F9649C000140B54 /* SFAnalyticsSQLiteStore.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                6C98083D1E788AEB00E70590 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               6CBF65431FA2257100A68667 /* SFAnalyticsActivityTracker.m in Sources */,
+                               6CAA8CF71F83E79E007B6E03 /* SFSQLite.m in Sources */,
                                476541A41F33EDED00413F65 /* SecdWatchdog.m in Sources */,
-                               47B011A71F17D8980030B49F /* SFAnalyticsLogger.m in Sources */,
-                               47B011981F17D78D0030B49F /* SFSQLite.m in Sources */,
                                47B011991F17D78D0030B49F /* SFSQLiteStatement.m in Sources */,
-                               47B011971F17D7810030B49F /* SFObjCType.m in Sources */,
                                DC2D438F1F0EEC2A0005D382 /* MockCloudKit.m in Sources */,
+                               6CDF8DEF1F96495600140B54 /* SFAnalyticsSampler.m in Sources */,
                                DCB515E21ED3D134001F1152 /* SecTask.c in Sources */,
                                DCB515E11ED3D11A001F1152 /* client.c in Sources */,
                                6C9808A61E788CD200E70590 /* CKKSCloudKitTests.m in Sources */,
                                6C98083E1E788AEB00E70590 /* spi.c in Sources */,
                                DC2353301ECA658900D7C1BE /* server_security_helpers.c in Sources */,
+                               6CAA8CF01F83E65E007B6E03 /* SFObjCType.m in Sources */,
+                               6CAA8D131F83ECD4007B6E03 /* SFAnalytics.m in Sources */,
                                DC2353321ECA659000D7C1BE /* server_xpc.m in Sources */,
+                               6CDB5FF91FA78D2400410924 /* SFAnalyticsMultiSampler.m in Sources */,
                                DC5F35B11EE0F28B00900966 /* server_entitlement_helpers.c in Sources */,
                                DC2353291ECA658300D7C1BE /* server_endpoint.m in Sources */,
+                               6CAA8CF91F83E7AA007B6E03 /* SFAnalyticsSQLiteStore.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               6CAA8CF61F83E79D007B6E03 /* SFSQLite.m in Sources */,
+                               6CDB5FF81FA78D2300410924 /* SFAnalyticsMultiSampler.m in Sources */,
                                476541A51F33EE1E00413F65 /* SecdWatchdog.m in Sources */,
-                               47B011AD1F17D8A00030B49F /* SFAnalyticsLogger.m in Sources */,
-                               47B0119B1F17D7F10030B49F /* SFSQLite.m in Sources */,
-                               47B0119C1F17D7F10030B49F /* SFSQLiteStatement.m in Sources */,
-                               47B0119A1F17D7E80030B49F /* SFObjCType.m in Sources */,
                                DC2D43951F0EEC300005D382 /* MockCloudKit.m in Sources */,
+                               6CAA8CF81F83E7A9007B6E03 /* SFAnalyticsSQLiteStore.m in Sources */,
                                6C9808A51E788CD100E70590 /* CKKSCloudKitTests.m in Sources */,
+                               6CBF65441FA2257200A68667 /* SFAnalyticsActivityTracker.m in Sources */,
                                DCB515E31ED3D135001F1152 /* SecTask.c in Sources */,
+                               6CAA8CEF1F83E65D007B6E03 /* SFObjCType.m in Sources */,
                                DCB515E01ED3D111001F1152 /* client.c in Sources */,
                                DCB515E41ED3D15A001F1152 /* client_endpoint.m in Sources */,
+                               6CAA8D141F83ECD5007B6E03 /* SFAnalytics.m in Sources */,
                                6C98087A1E788AFD00E70590 /* spi.c in Sources */,
+                               6CAA8D0D1F83EC57007B6E03 /* SFSQLiteStatement.m in Sources */,
                                DC5F35B21EE0F28C00900966 /* server_entitlement_helpers.c in Sources */,
                                DC2353311ECA658B00D7C1BE /* server_security_helpers.c in Sources */,
                                DC2353331ECA659000D7C1BE /* server_xpc.m in Sources */,
                                DC23532F1ECA658400D7C1BE /* server_endpoint.m in Sources */,
+                               6CDF8DF01F96495700140B54 /* SFAnalyticsSampler.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               6C9AA79A1F7C1D8F00D08296 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               6C9AA7A51F7C6F7F00D08296 /* SecArgParse.c in Sources */,
+                               6C9AA7A11F7C1D9000D08296 /* main.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               6CAA8D1C1F842FB3007B6E03 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               6CAA8D351F84306C007B6E03 /* main.m in Sources */,
+                               6CAA8D271F843002007B6E03 /* supd.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               728B569D16D59979008FA3AB /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               72CD2BBE16D59AE30064EEE1 /* OTAServiceApp.m in Sources */,
-                               72CD2BBF16D59AE30064EEE1 /* OTAServicemain.m in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                790851B30CA9859F0083CC4D /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                                D43DBEFB1E99D1CA00C04AEA /* asynchttp.c in Sources */,
                                D43DBEFC1E99D1CA00C04AEA /* nameconstraints.c in Sources */,
-                               D43DBEFD1E99D1CA00C04AEA /* OTATrustUtilities.c in Sources */,
+                               D43DBEFD1E99D1CA00C04AEA /* OTATrustUtilities.m in Sources */,
                                D43DBEFE1E99D1CA00C04AEA /* personalization.c in Sources */,
                                D43DBEFF1E99D1CA00C04AEA /* policytree.c in Sources */,
                                D43DBF001E99D1CA00C04AEA /* SecCAIssuerCache.c in Sources */,
                                D43DBF081E99D1CA00C04AEA /* SecPolicyServer.c in Sources */,
                                D43DBF091E99D1CA00C04AEA /* SecRevocationDb.c in Sources */,
                                D43DBF0A1E99D1CA00C04AEA /* SecRevocationServer.c in Sources */,
-                               D43DBF0B1E99D1CA00C04AEA /* SecTrustLoggingServer.c in Sources */,
+                               D43DBF0B1E99D1CA00C04AEA /* SecTrustLoggingServer.m in Sources */,
                                D43DBF0C1E99D1CA00C04AEA /* SecTrustServer.c in Sources */,
                                D43DBF0D1E99D1CA00C04AEA /* SecTrustStoreServer.c in Sources */,
                                D40B6A9B1E2B690E00CD6EE5 /* SecuritydXPC.c in Sources */,
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               4723C9C91F152ECA0082882F /* SFSQLite.m in Sources */,
+                               0CBD55B91FE883F300A8CE21 /* SFBehavior.m in Sources */,
+                               D46246A71F9AE62000D63882 /* oids.c in Sources */,
                                DCA85B991E8D980B00BA7241 /* client_endpoint.m in Sources */,
+                               DC926F0A1F33FA8E0012A315 /* CKKSControlProtocol.m in Sources */,
+                               6CE365541FA101090012F6AB /* SFAnalyticsSampler.m in Sources */,
+                               6CE365581FA1017E0012F6AB /* SFAnalyticsSQLiteStore.m in Sources */,
+                               6CDB5FF51FA78D1A00410924 /* SFAnalyticsMultiSampler.m in Sources */,
                                DCA85B941E8D97E400BA7241 /* client.c in Sources */,
                                DCDF0A4F1D81D76F007AF174 /* Security.exp-in in Sources */,
+                               0CBFEACA200FCD2D009A60E9 /* SFTransactionMetric.m in Sources */,
                                DC1789A51D779E3B00B50D50 /* dummy.cpp in Sources */,
-                               4723C9C51F152EBC0082882F /* SFObjCType.m in Sources */,
+                               0C8BBF111FCB4AAA00580909 /* OTControl.m in Sources */,
                                4723C9CD1F152ED40082882F /* SFSQLiteStatement.m in Sources */,
-                               4723C9E11F1540CE0082882F /* SFAnalyticsLogger.m in Sources */,
+                               EB10A3E920356E7A00E84270 /* OTConstants.m in Sources */,
+                               6CAA8CFE1F83E800007B6E03 /* SFSQLite.m in Sources */,
+                               DC9C95C01F79DC89000D19E5 /* CKKSControl.m in Sources */,
+                               0C8BBF141FCB4AFB00580909 /* OTControlProtocol.m in Sources */,
                                B61577E81F20151C004A3930 /* SecPaddingConfigurations.c in Sources */,
+                               6C73F48B2006B83A003D5D63 /* SOSAnalytics.m in Sources */,
+                               6CE3654D1FA100E50012F6AB /* SFAnalytics.m in Sources */,
+                               6CAA8CFD1F83E7EB007B6E03 /* SFObjCType.m in Sources */,
                                DC1789A21D779DF400B50D50 /* SecBreadcrumb.c in Sources */,
+                               6CBF65411FA1481100A68667 /* SFAnalyticsActivityTracker.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               BEE4B18D1FFD588000777D39 /* OTAuthenticatedCiphertext.proto in Sources */,
+                               BEB0B0D81FFC3DD3007E6A83 /* OTPrivateKey.proto in Sources */,
+                               BE3405AE1FD725EC00933DAC /* OTBottle.proto in Sources */,
+                               BE3405AF1FD725F000933DAC /* OTBottleContents.proto in Sources */,
+                               DC9FD3231F8587A500C8AAC8 /* CKKSSerializedKey.proto in Sources */,
                                DC222C3A1E034D1F00B09171 /* CKKSItemEncrypter.m in Sources */,
                                DC7A17F01E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.m in Sources */,
                                DCEA5D581E2826DB0089CF55 /* CKKSSIV.m in Sources */,
                                EBB407B41EBA46B300A541A5 /* CKKSPowerCollection.m in Sources */,
                                DCB5D93E1E4A9A3400BE22AB /* CKKSSynchronizeOperation.m in Sources */,
+                               0CD9E8011FE05B6600F66C38 /* OTContextRecord.m in Sources */,
+                               BEB0B0DE1FFC45D8007E6A83 /* OTPrivateKey+SF.m in Sources */,
                                DC222C3B1E034D1F00B09171 /* SOSChangeTracker.c in Sources */,
                                DC222C3D1E034D1F00B09171 /* SOSEngine.c in Sources */,
                                6C8CC3B31E2F913D009025C5 /* AWDKeychainCKKSRateLimiterAggregatedScores.m in Sources */,
                                DC222C401E034D1F00B09171 /* SecDbItem.c in Sources */,
                                DCCD88EB1E42622200F5AA71 /* CKKSGroupOperation.m in Sources */,
-                               DC222C411E034D1F00B09171 /* SecDbKeychainItem.c in Sources */,
+                               DC222C411E034D1F00B09171 /* SecDbKeychainItem.m in Sources */,
+                               0C8BBEAA1FC9DBC000580909 /* OTLocalStore.m in Sources */,
+                               4733377C1FDAFBCC00E19F30 /* SFKeychainControlManager.m in Sources */,
+                               0CE1BCCF1FCE11690017230E /* OTBottledPeerSigned.m in Sources */,
                                DC222C421E034D1F00B09171 /* SecDbQuery.c in Sources */,
                                6C3446471E25346C00F9522B /* CKKSRateLimiter.m in Sources */,
                                DCA4D2001E552DD50056214F /* CKKSCurrentKeyPointer.m in Sources */,
                                DC222C431E034D1F00B09171 /* SecItemBackupServer.c in Sources */,
                                DCE278E01ED789EF0083B485 /* CKKSCurrentItemPointer.m in Sources */,
                                DC222C441E034D1F00B09171 /* SecItemDataSource.c in Sources */,
+                               DC3D748F1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.m in Sources */,
+                               0C8BBF161FCB4B1C00580909 /* OTManager.m in Sources */,
+                               0C8BBEA61FC9DBB200580909 /* OTEscrowKeys.m in Sources */,
                                526965D31E6E284500627F9D /* AsymKeybagBackup.m in Sources */,
+                               DA6AA1661FE88AFB004565B0 /* CKKSControlServer.m in Sources */,
                                DCFE1C541F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.m in Sources */,
+                               47922D491FAA7C3D0008F7E0 /* SecDbKeychainSerializedMetadata.m in Sources */,
                                DCD6C4B51EC5302500414FEE /* CKKSNearFutureScheduler.m in Sources */,
                                6C588D811EAA20AC00D7E322 /* RateLimiter.m in Sources */,
                                DC94BCCD1F10448600E07CEB /* CloudKitCategories.m in Sources */,
                                DC15F7691E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.m in Sources */,
                                DC222C461E034D1F00B09171 /* SecItemDb.c in Sources */,
                                DC222C471E034D1F00B09171 /* SecItemSchema.c in Sources */,
+                               DC9FD32D1F85990B00C8AAC8 /* CKKSPeer.m in Sources */,
                                DCEA5D881E2F14810089CF55 /* CKKSAPSReceiver.m in Sources */,
                                DC2C5F611F0EB97E00FEBDA7 /* CKKSNotifier.m in Sources */,
                                DC222C481E034D1F00B09171 /* SecItemServer.c in Sources */,
                                DC18F7721E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.m in Sources */,
                                DC222C491E034D1F00B09171 /* SecKeybagSupport.c in Sources */,
+                               471A03F21F72E35C000A8904 /* SecDbKeychainItemV7.m in Sources */,
+                               0C8BBF181FCB4E5000580909 /* OTControlProtocol.m in Sources */,
+                               EB4E0CDC1FF36A9700CDCACC /* CKKSReachabilityTracker.m in Sources */,
                                DC1DA6691E4555D80094CE7F /* CKKSScanLocalItemsOperation.m in Sources */,
                                6C8CC3B41E2F913D009025C5 /* AWDKeychainCKKSRateLimiterOverload.m in Sources */,
+                               0C8BBEA21FC9DBAA00580909 /* OTContext.m in Sources */,
                                DC222C4A1E034D1F00B09171 /* SecLogSettingsServer.m in Sources */,
+                               DC14478D1F5764C600236DB4 /* CKKSResultOperation.m in Sources */,
                                479DA1781EBBA8D30065C98F /* CKKSManifest.m in Sources */,
                                DCD662F81E329B6800188186 /* CKKSNewTLKOperation.m in Sources */,
+                               DC124DCE20059BA900BE8DAC /* OctagonControlServer.m in Sources */,
                                DC222C4D1E034D1F00B09171 /* CKKSOutgoingQueueEntry.m in Sources */,
+                               DCBF2F881F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.m in Sources */,
+                               EB10A3E720356E6500E84270 /* OTConstants.m in Sources */,
+                               0C5CFB392019610000913B9C /* OTRamping.m in Sources */,
                                DC222C4E1E034D1F00B09171 /* CKKS.m in Sources */,
                                DC762AA11E57A86A00B03A2C /* CKKSRecordHolder.m in Sources */,
                                DC222C501E034D1F00B09171 /* SecOTRRemote.m in Sources */,
-                               479108BA1EE879F9008CEFA0 /* CKKSAnalyticsLogger.m in Sources */,
+                               47922D451FAA7C2E0008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.m in Sources */,
+                               479108BA1EE879F9008CEFA0 /* CKKSAnalytics.m in Sources */,
+                               479108BA1EE879F9008CEFA0 /* CKKSAnalytics.m in Sources */,
+                               DC1447991F5766D200236DB4 /* NSOperationCategories.m in Sources */,
                                DC222C511E034D1F00B09171 /* CKKSItem.m in Sources */,
                                DCBDB3BE1E57CA7A00B61300 /* CKKSViewManager.m in Sources */,
                                DCFE1C2A1F17E455007640C8 /* CKKSDeviceStateEntry.m in Sources */,
+                               0C8BBEA81FC9DBB600580909 /* OTIdentity.m in Sources */,
+                               DCAD9B471F8D939C00C5E2AE /* CKKSFixups.m in Sources */,
                                DCA4D2181E5684220056214F /* CKKSReencryptOutgoingItemsOperation.m in Sources */,
                                DCE278EB1ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.m in Sources */,
                                DC222C541E034D1F00B09171 /* CKKSSQLDatabaseObject.m in Sources */,
                                DCEA5D981E3015840089CF55 /* CKKSZone.m in Sources */,
+                               0CE407AD1FD4769B00F59B31 /* OTCloudStoreState.m in Sources */,
                                DCB837381ED5045100015C07 /* CKKSLockStateTracker.m in Sources */,
-                               DCF7A8A41F0450EB00CABE89 /* CKKSControlProtocol.m in Sources */,
+                               47922D4D1FAA7C4B0008F7E0 /* SecDbKeychainSerializedSecretData.m in Sources */,
                                DC4DB1531E24692100CD6769 /* CKKSKey.m in Sources */,
                                DC9082C51EA0277700D0C1C5 /* CKKSZoneChangeFetcher.m in Sources */,
+                               0CCCC7CA20261D310024405E /* OT.m in Sources */,
+                               47922D571FAA7E0E0008F7E0 /* SecDbKeychainSerializedItemV7.m in Sources */,
                                DC222C571E034D1F00B09171 /* SecuritydXPC.c in Sources */,
+                               DC7341F61F8447AB00AB9BDF /* CKKSTLKShare.m in Sources */,
                                6C8CC3B51E2F913D009025C5 /* AWDKeychainCKKSRateLimiterTopWriters.m in Sources */,
                                DCBDB3B81E57C82300B61300 /* CKKSKeychainView.m in Sources */,
                                DC222C5A1E034D1F00B09171 /* iCloudTrace.c in Sources */,
                                DC5BB5011E0C98320010F836 /* CKKSOutgoingQueueOperation.m in Sources */,
+                               0C8BBEA01FC9DBA400580909 /* OTBottledPeer.m in Sources */,
                                6C869A7A1F54C37A00957298 /* AWDKeychainSOSKeychainBackupFailed.m in Sources */,
                                6C869A761F50CAF500957298 /* SOSEnsureBackup.m in Sources */,
+                               BE2AD2BB1FDA080900739F96 /* OTBottledPeerRecord.m in Sources */,
+                               0C770EC51FCF7E2000B5F0E2 /* OTCloudStore.m in Sources */,
                                5269658E1E6A154800627F9D /* SecBackupKeybagEntry.m in Sources */,
+                               0C36B3222007F2570029F7A2 /* OTPreflightInfo.m in Sources */,
                                DC222C5D1E034D1F00B09171 /* CKKSMirrorEntry.m in Sources */,
+                               BEE4B1951FFD604B00777D39 /* OTAuthenticatedCiphertext+SF.m in Sources */,
                                DC54DD101EA7D9E800108E92 /* CKKSManifestLeafRecord.m in Sources */,
                                DCFE1C371F17ECE5007640C8 /* CKKSCondition.m in Sources */,
                                DC222C611E034D1F00B09171 /* swcagent_client.c in Sources */,
+                               BEE4B19B1FFDAFE600777D39 /* SFECPublicKey+SPKI.m in Sources */,
                                DC222C621E034D1F00B09171 /* CKKSZoneStateEntry.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        buildActionMask = 2147483647;
                        files = (
                                476541A61F33EE2700413F65 /* SecdWatchdog.m in Sources */,
-                               4771ECD91F17CE5100840998 /* SFAnalyticsLogger.m in Sources */,
-                               4771ECCE1F17CD2100840998 /* SFObjCType.m in Sources */,
-                               4771ECCC1F17CD0E00840998 /* SFSQLite.m in Sources */,
+                               6CAA8CF41F83E799007B6E03 /* SFSQLite.m in Sources */,
                                4771ECCD1F17CD0E00840998 /* SFSQLiteStatement.m in Sources */,
                                DCD6C4B71EC5319600414FEE /* CKKSNearFutureSchedulerTests.m in Sources */,
                                DC08D1C41E64FA8C006237DA /* CloudKitKeychainSyncingMockXCTest.m in Sources */,
                                47E553741EDF674700749715 /* CKKSManifestTests.m in Sources */,
                                6C588D7F1EAA14AA00D7E322 /* RateLimiterTests.m in Sources */,
-                               DC4DB15F1E2590B100CD6769 /* CKKSEncryptionTests.m in Sources */,
+                               DC4DB15F1E2590B100CD6769 /* CKKSAESSIVEncryptionTests.m in Sources */,
                                DC3502E71E0214C800BC0587 /* MockCloudKit.m in Sources */,
+                               6CAA8D151F83ECD9007B6E03 /* SFAnalytics.m in Sources */,
                                DC6593D11ED8DAB900C19462 /* CKKSTests+CurrentPointerAPI.m in Sources */,
+                               6CBF65451FA2257500A68667 /* SFAnalyticsActivityTracker.m in Sources */,
                                DCA85B9A1E8D981100BA7241 /* client_endpoint.m in Sources */,
+                               DCAD9B491F8D95F200C5E2AE /* CloudKitKeychainSyncingFixupTests.m in Sources */,
+                               0CA4EBF3202B8D9C002B1D96 /* CloudKitKeychainSyncingTestsBase.m in Sources */,
                                DC9A2C5F1EB3F557008FAC27 /* CKKSTests+Coalesce.m in Sources */,
                                DC222C8A1E089BAE00B09171 /* CKKSSQLTests.m in Sources */,
                                DC15F79C1E68EAD5003B9A40 /* CKKSTests+API.m in Sources */,
                                4723C9D41F1531A30082882F /* CKKSLoggerTests.m in Sources */,
+                               6C73F48C2006B83D003D5D63 /* SOSAnalytics.m in Sources */,
+                               DCBF2F7D1F90084D00ED0CA4 /* CKKSTLKSharingTests.m in Sources */,
+                               DCFABF8E20081E2F001128B5 /* CKKSDeviceStateUploadTests.m in Sources */,
                                DC3502B81E0208BE00BC0587 /* CKKSTests.m in Sources */,
                                6C3446301E24F6BE00F9522B /* CKKSRateLimiterTests.m in Sources */,
                                DCA85B961E8D980100BA7241 /* client.c in Sources */,
+                               6CAA8CFA1F83E7AC007B6E03 /* SFAnalyticsSQLiteStore.m in Sources */,
                                DCE7F2091F21726500DDB0F7 /* CKKSAPSReceiverTests.m in Sources */,
                                DC96053F1ECA2D6400AF9BDA /* SecTask.c in Sources */,
                                DC08D1CC1E64FCC5006237DA /* CKKSSOSTests.m in Sources */,
+                               6CDB5FF71FA78D2100410924 /* SFAnalyticsMultiSampler.m in Sources */,
+                               6CDF8DF11F96498300140B54 /* SFAnalyticsSampler.m in Sources */,
                                DC222CA81E08A7D900B09171 /* CloudKitMockXCTest.m in Sources */,
                                DC9C75161E4BCE1800F1CA0D /* CKKSOperationTests.m in Sources */,
                                DCB221561E8B08BF001598BC /* server_xpc.m in Sources */,
                                DC4268FE1E820371002B7110 /* server_endpoint.m in Sources */,
                                DCFE1C3D1F17EFB5007640C8 /* CKKSConditionTests.m in Sources */,
                                DCCD33C91E3FE95900AA4AD1 /* spi.c in Sources */,
+                               6CFDC4551F907D2600646DBB /* SFObjCType.m in Sources */,
+                               DC9C95971F748D0B000D19E5 /* CKKSServerValidationRecoveryTests.m in Sources */,
+                               DC7341FE1F84642C00AB9BDF /* CKKSTLKSharingEncryptionTests.m in Sources */,
                                DC5F35AC1EE0F27900900966 /* server_entitlement_helpers.c in Sources */,
+                               DAEE055C1FAD3FC700DF27F3 /* AutoreleaseTest.c in Sources */,
+                               DA19DAEF1FCFA420008E82EE /* CKKSControl.m in Sources */,
+                               DA19DAF01FCFA425008E82EE /* CKKSControlProtocol.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               BEE4B18C1FFD585800777D39 /* OTAuthenticatedCiphertext.proto in Sources */,
+                               BEB0B0D71FFC3D9A007E6A83 /* OTPrivateKey.proto in Sources */,
+                               BE3405AC1FD7258900933DAC /* OTBottle.proto in Sources */,
+                               BE3405AD1FD725A700933DAC /* OTBottleContents.proto in Sources */,
+                               DC9FD3361F86A34F00C8AAC8 /* CKKSSerializedKey.proto in Sources */,
                                DC797E1A1DD3F9A400CC9E42 /* CKKSSQLDatabaseObject.m in Sources */,
                                6CC1859F1E24E8EB009657D8 /* CKKSRateLimiter.m in Sources */,
                                DCFB12C71E95A4C000510F5F /* CKKSCKAccountStateTracker.m in Sources */,
                                EBB407B31EBA46B200A541A5 /* CKKSPowerCollection.m in Sources */,
                                DCCD88EA1E42622200F5AA71 /* CKKSGroupOperation.m in Sources */,
+                               0CD9E8001FE05B6600F66C38 /* OTContextRecord.m in Sources */,
+                               BEB0B0DD1FFC45D7007E6A83 /* OTPrivateKey+SF.m in Sources */,
                                DC54DD0F1EA7D9E700108E92 /* CKKSManifestLeafRecord.m in Sources */,
                                DCDCCB901DF7B8D4006E840E /* CKKSItem.m in Sources */,
                                DC1ED8C11DD5197E002BDCFA /* CKKSItemEncrypter.m in Sources */,
                                DC6D2C921DD2835A00BE372D /* CKKSOutgoingQueueEntry.m in Sources */,
                                6C8CC3AD1E2F913C009025C5 /* AWDKeychainCKKSRateLimiterTopWriters.m in Sources */,
                                DC378B3D1DF0CA7200A3DAFA /* CKKSIncomingQueueEntry.m in Sources */,
+                               0C8BBEA91FC9DBBF00580909 /* OTLocalStore.m in Sources */,
+                               4733377B1FDAFBCC00E19F30 /* SFKeychainControlManager.m in Sources */,
+                               0CE1BCCE1FCE11680017230E /* OTBottledPeerSigned.m in Sources */,
                                DC5BB4FA1E0C90DE0010F836 /* CKKSIncomingQueueOperation.m in Sources */,
                                DC5BB5001E0C98320010F836 /* CKKSOutgoingQueueOperation.m in Sources */,
                                DC378B391DEFADB500A3DAFA /* CKKSZoneStateEntry.m in Sources */,
                                6C588D801EAA20AB00D7E322 /* RateLimiter.m in Sources */,
                                DC15F7681E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.m in Sources */,
                                DCE278DF1ED789EF0083B485 /* CKKSCurrentItemPointer.m in Sources */,
+                               DC3D748E1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.m in Sources */,
+                               0C8BBF151FCB4B1B00580909 /* OTManager.m in Sources */,
+                               0C8BBEA51FC9DBB100580909 /* OTEscrowKeys.m in Sources */,
                                DCA4D1FF1E552DD50056214F /* CKKSCurrentKeyPointer.m in Sources */,
+                               DA6AA1651FE88AFB004565B0 /* CKKSControlServer.m in Sources */,
                                DCFE1C531F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.m in Sources */,
+                               47922D481FAA7C3C0008F7E0 /* SecDbKeychainSerializedMetadata.m in Sources */,
                                DCD6C4B41EC5302500414FEE /* CKKSNearFutureScheduler.m in Sources */,
                                DC378B2F1DEF9E0E00A3DAFA /* CKKSMirrorEntry.m in Sources */,
                                DC94BCCC1F10448600E07CEB /* CloudKitCategories.m in Sources */,
+                               DC9FD32C1F85990A00C8AAC8 /* CKKSPeer.m in Sources */,
                                DC1ED8C61DD55476002BDCFA /* CKKS.m in Sources */,
                                DCB5D93D1E4A9A3400BE22AB /* CKKSSynchronizeOperation.m in Sources */,
                                DC762AA01E57A86A00B03A2C /* CKKSRecordHolder.m in Sources */,
                                DC52E7CF1D80BCFD00B0A59C /* SOSEngine.c in Sources */,
                                DC4DB1521E24692100CD6769 /* CKKSKey.m in Sources */,
                                DCBDB3BD1E57CA7A00B61300 /* CKKSViewManager.m in Sources */,
+                               471A03EC1F72E35B000A8904 /* SecDbKeychainItemV7.m in Sources */,
+                               0C8BBF171FCB4E5000580909 /* OTControlProtocol.m in Sources */,
+                               EB4E0CDB1FF36A9700CDCACC /* CKKSReachabilityTracker.m in Sources */,
                                DC52E7C41D80BCAD00B0A59C /* SecDbItem.c in Sources */,
-                               DC52E7D31D80BD1800B0A59C /* SecDbKeychainItem.c in Sources */,
+                               DC52E7D31D80BD1800B0A59C /* SecDbKeychainItem.m in Sources */,
                                DC52E7CC1D80BCDF00B0A59C /* SecDbQuery.c in Sources */,
+                               DC14478C1F5764C600236DB4 /* CKKSResultOperation.m in Sources */,
                                479DA1721EBBA8D10065C98F /* CKKSManifest.m in Sources */,
                                DC52E7CB1D80BCD800B0A59C /* SecItemBackupServer.c in Sources */,
                                DC52E7CD1D80BCE700B0A59C /* SecItemDataSource.c in Sources */,
+                               DC124DCD20059BA900BE8DAC /* OctagonControlServer.m in Sources */,
                                DC52E7DE1D80BD7F00B0A59C /* SecItemDb.c in Sources */,
                                DC52E7E01D80BD8D00B0A59C /* SecItemSchema.c in Sources */,
+                               EB10A3E820356E6500E84270 /* OTConstants.m in Sources */,
+                               0C5CFB382019610000913B9C /* OTRamping.m in Sources */,
                                DC52E7D71D80BD2D00B0A59C /* SecItemServer.c in Sources */,
-                               479108B91EE879F9008CEFA0 /* CKKSAnalyticsLogger.m in Sources */,
+                               47922D441FAA7C2C0008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.m in Sources */,
+                               479108B91EE879F9008CEFA0 /* CKKSAnalytics.m in Sources */,
+                               479108B91EE879F9008CEFA0 /* CKKSAnalytics.m in Sources */,
+                               0C8BBEE61FCA6E0500580909 /* OTContext.m in Sources */,
+                               DC1447981F5766D200236DB4 /* NSOperationCategories.m in Sources */,
                                DCD8A0CF1E09EA1800E4FA0A /* SecKeybagSupport.c in Sources */,
                                DC52E7E11D80BD9300B0A59C /* SecLogSettingsServer.m in Sources */,
                                DCFE1C291F17E455007640C8 /* CKKSDeviceStateEntry.m in Sources */,
+                               DCAD9B461F8D939C00C5E2AE /* CKKSFixups.m in Sources */,
+                               0C8BBEA71FC9DBB500580909 /* OTIdentity.m in Sources */,
                                6C8CC3AC1E2F913C009025C5 /* AWDKeychainCKKSRateLimiterOverload.m in Sources */,
                                DC52E7DC1D80BD4F00B0A59C /* SecOTRRemote.m in Sources */,
                                DCE278EA1ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.m in Sources */,
                                DCD662F71E329B6800188186 /* CKKSNewTLKOperation.m in Sources */,
                                DCB837321ED5045000015C07 /* CKKSLockStateTracker.m in Sources */,
-                               DCF7A8A31F0450EB00CABE89 /* CKKSControlProtocol.m in Sources */,
+                               0CE407AC1FD4769B00F59B31 /* OTCloudStoreState.m in Sources */,
+                               47922D4C1FAA7C4A0008F7E0 /* SecDbKeychainSerializedSecretData.m in Sources */,
                                DCBDB3B71E57C82300B61300 /* CKKSKeychainView.m in Sources */,
                                DC52E7D61D80BD2800B0A59C /* SecuritydXPC.c in Sources */,
+                               47922D561FAA7E0D0008F7E0 /* SecDbKeychainSerializedItemV7.m in Sources */,
+                               0CCCC7C920261D310024405E /* OT.m in Sources */,
                                DC7A17EF1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.m in Sources */,
+                               DC7341F51F8447AB00AB9BDF /* CKKSTLKShare.m in Sources */,
+                               0C5960811FB369C50095BA29 /* CKKSHealTLKSharesOperation.m in Sources */,
                                DCA4D2171E5684220056214F /* CKKSReencryptOutgoingItemsOperation.m in Sources */,
                                5269658D1E6A154700627F9D /* SecBackupKeybagEntry.m in Sources */,
                                DC52E7D41D80BD1D00B0A59C /* iCloudTrace.c in Sources */,
                                DCEA5D871E2F14810089CF55 /* CKKSAPSReceiver.m in Sources */,
+                               0C8BBE9F1FC9DBA400580909 /* OTBottledPeer.m in Sources */,
                                6C869A791F54C37900957298 /* AWDKeychainSOSKeychainBackupFailed.m in Sources */,
                                6C869A751F50CAF400957298 /* SOSEnsureBackup.m in Sources */,
+                               BE2AD2BA1FDA080800739F96 /* OTBottledPeerRecord.m in Sources */,
+                               0C770EC41FCF7E2000B5F0E2 /* OTCloudStore.m in Sources */,
                                DCEA5D571E2826DB0089CF55 /* CKKSSIV.m in Sources */,
+                               0C36B3212007F2550029F7A2 /* OTPreflightInfo.m in Sources */,
                                6C8CC3AB1E2F913C009025C5 /* AWDKeychainCKKSRateLimiterAggregatedScores.m in Sources */,
+                               BEE4B1941FFD604B00777D39 /* OTAuthenticatedCiphertext+SF.m in Sources */,
                                DC9082C41EA0277600D0C1C5 /* CKKSZoneChangeFetcher.m in Sources */,
                                DCFE1C361F17ECE5007640C8 /* CKKSCondition.m in Sources */,
                                DCEA5D971E3015830089CF55 /* CKKSZone.m in Sources */,
+                               BEE4B19A1FFDAFE600777D39 /* SFECPublicKey+SPKI.m in Sources */,
                                DC52E7C51D80BCB300B0A59C /* swcagent_client.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                                48E617211DBEC6BA0098EAAD /* SOSBackupInformation.m in Sources */,
                                DC52E8F11D80C34000B0A59C /* SOSAccount.m in Sources */,
                                DC52E8F31D80C34000B0A59C /* SOSAccountBackup.m in Sources */,
+                               DCB332591F478C3C00178C30 /* SOSUserKeygen.m in Sources */,
                                DC52E8F41D80C34000B0A59C /* SOSAccountCircles.m in Sources */,
                                0CD8CB0B1ECA50920076F37F /* SOSPeerOTRTimer.m in Sources */,
+                               DC2670F51F3E711400816EED /* SOSAccountCloudParameters.m in Sources */,
                                DCDCC7E51D9B5526006487E8 /* SOSAccountSync.m in Sources */,
+                               DC2670F81F3E723B00816EED /* SOSAccountDer.m in Sources */,
                                DC52E8F71D80C34000B0A59C /* SOSAccountCredentials.m in Sources */,
                                DC52E8F91D80C34000B0A59C /* SOSAccountFullPeerInfo.m in Sources */,
                                DC52E8FC1D80C34000B0A59C /* SOSAccountLog.m in Sources */,
                                DC52E8FD1D80C34000B0A59C /* SOSAccountUpdate.m in Sources */,
                                DC52E9001D80C34000B0A59C /* SOSAccountViewSync.m in Sources */,
                                DC52E9011D80C34000B0A59C /* SOSBackupEvent.c in Sources */,
+                               DC2670F71F3E721800816EED /* SOSAccountTrustClassic.m in Sources */,
                                7281E0871DFD01800021E1B7 /* SOSAccountGetSet.m in Sources */,
                                0C4899121E0E105D00C6CF70 /* SOSTransportCircleCK.m in Sources */,
                                DC52E8DD1D80C31F00B0A59C /* SOSCoder.c in Sources */,
                                0CAD1E1C1E032ADB00537693 /* SOSCloudCircleServer.m in Sources */,
                                DC52E8CF1D80C2FD00B0A59C /* SOSTransportMessageIDS.m in Sources */,
                                0CAC5DBF1EB3DA4C00AD884B /* SOSPeerRateLimiter.m in Sources */,
+                               DAB27AE11FA29EE300DEBBDE /* SOSControlServer.m in Sources */,
                                DC52E8D01D80C2FD00B0A59C /* SOSTransportMessageKVS.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                                DC52EAA11D80CCAC00B0A59C /* SecurityTool.c in Sources */,
                                DC52EAA01D80CCA700B0A59C /* whoami.m in Sources */,
                                DC52EA9F1D80CCA100B0A59C /* digest_calc.c in Sources */,
+                               473337841FDB29C400E19F30 /* KeychainCheck.m in Sources */,
                                EBEEEE3C1EA31D9600E15F5C /* SOSControlHelper.m in Sources */,
                                DC52EA9E1D80CC9B00B0A59C /* leaks.c in Sources */,
                                EB48C1A61E573EEC00EC5E57 /* sos.m in Sources */,
                        buildActionMask = 2147483647;
                        files = (
                                DC52EC1E1D80CF6700B0A59C /* verify_cert.c in Sources */,
+                               D453C3901FEC66AE00DE349B /* trust_update.m in Sources */,
                                DC52EC1D1D80CF6200B0A59C /* keychain_util.c in Sources */,
                                DC52EC1C1D80CF5D00B0A59C /* add_internet_password.c in Sources */,
                                DC52EC1B1D80CF5600B0A59C /* codesign.c in Sources */,
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               DCD7EE841F4E46F9007D9804 /* accountCirclesViewsPrint.m in Sources */,
                                0C0CECA41DA45ED700C22FBC /* recovery_key.m in Sources */,
                                DC52EC3B1D80CFE900B0A59C /* syncbackup.m in Sources */,
                                DC52EC3A1D80CFE400B0A59C /* keychain_log.m in Sources */,
-                               48C2F93B1E4BCFE80093D70C /* accountCirclesViewsPrint.m in Sources */,
                                DC52EC391D80CFDF00B0A59C /* secViewDisplay.c in Sources */,
                                DC52EC381D80CFDB00B0A59C /* secToolFileIO.c in Sources */,
                                DC52EC371D80CFD400B0A59C /* keychain_sync_test.m in Sources */,
                                DC52EC361D80CFD000B0A59C /* keychain_sync.m in Sources */,
                                DC3C7C901D83957F00F6A832 /* NSFileHandle+Formatting.m in Sources */,
+                               DCE5DC0F1EA80256006308A6 /* SOSSysdiagnose.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                DC52ECBD1D80D22600B0A59C /* si-42-identity.c in Sources */,
                                DC52ECBE1D80D22600B0A59C /* si-43-persistent.c in Sources */,
                                DC52ECC31D80D22600B0A59C /* si-50-secrandom.c in Sources */,
-                               DC52ECC71D80D22600B0A59C /* si-63-scep.c in Sources */,
+                               DC52ECC71D80D22600B0A59C /* si-63-scep.m in Sources */,
                                DC52ECCD1D80D22600B0A59C /* si-69-keydesc.c in Sources */,
                                DC52ECD01D80D22600B0A59C /* si-72-syncableitems.c in Sources */,
                                DC52ECD11D80D22600B0A59C /* si-73-secpasswordgenerate.c in Sources */,
                                DC52ECD51D80D22600B0A59C /* si-78-query-attrs.c in Sources */,
                                DC52ECD61D80D22600B0A59C /* si-80-empty-data.c in Sources */,
                                DC52ECD91D80D22600B0A59C /* si-82-token-ag.c in Sources */,
-                               DC52ECDD1D80D22600B0A59C /* si-89-cms-hash-agility.c in Sources */,
+                               DC52ECDD1D80D22600B0A59C /* si-89-cms-hash-agility.m in Sources */,
                                DC52ECDE1D80D22600B0A59C /* si-90-emcs.m in Sources */,
                                DC52ECDF1D80D22600B0A59C /* si-95-cms-basic.c in Sources */,
                                DC52EC981D80D1D100B0A59C /* vmdh-40.c in Sources */,
                                0CAD1E591E1C5CBD00537693 /* secd-52-offering-gencount-reset.m in Sources */,
                                DC52EDDD1D80D5C500B0A59C /* secd-70-engine-corrupt.m in Sources */,
                                DC52EDDE1D80D5C500B0A59C /* secd-70-engine-smash.m in Sources */,
+                               0C5F4FD81F952FEA00AF1616 /* secd-700-sftm.m in Sources */,
                                522B280E1E64B4BF002B5638 /* secd-230-keybagtable.m in Sources */,
                                DC52EDDF1D80D5C500B0A59C /* secd-70-otr-remote.m in Sources */,
                                DC52EDE21D80D5C500B0A59C /* secd-74-engine-beer-servers.m in Sources */,
                                DC52EE441D80D71900B0A59C /* si-21-sectrust-asr.c in Sources */,
                                DC52EE451D80D71900B0A59C /* si-22-sectrust-iap.c in Sources */,
                                DC52EE471D80D71900B0A59C /* si-23-sectrust-ocsp.c in Sources */,
-                               D48E4E241E42F0620011B4BA /* si-62-csr.c in Sources */,
+                               D48E4E241E42F0620011B4BA /* si-62-csr.m in Sources */,
                                DC52EE481D80D71900B0A59C /* si-24-sectrust-digicert-malaysia.c in Sources */,
                                DC52EE491D80D71900B0A59C /* si-24-sectrust-diginotar.c in Sources */,
                                DC52EE4A1D80D71900B0A59C /* si-24-sectrust-itms.c in Sources */,
                                DC52EE5A1D80D73800B0A59C /* si-83-seccertificate-sighashalg.c in Sources */,
                                DC52EE5B1D80D73800B0A59C /* si-97-sectrust-path-scoring.m in Sources */,
                                D47E69401E92F75D002C8CF6 /* si-61-pkcs12.c in Sources */,
+                               BEB9E9EC1FFF195C00676593 /* si-88-sectrust-valid.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               DC59E9D01D91C9DC001BDDF5 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               DC59EA031D91CA0A001BDDF5 /* DER_Decode.c in Sources */,
-                               DC59EA051D91CA0A001BDDF5 /* DER_Encode.c in Sources */,
-                               DC59E9FE1D91CA0A001BDDF5 /* DER_Keys.c in Sources */,
-                               DC59EA0A1D91CA0A001BDDF5 /* DER_Digest.c in Sources */,
-                               DC59EA0B1D91CA0A001BDDF5 /* oids.c in Sources */,
-                               DC59EA011D91CA0A001BDDF5 /* DER_CertCrl.c in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               DC59EA1A1D91CA15001BDDF5 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               DC59EA2F1D91CA2C001BDDF5 /* fileIo.c in Sources */,
-                               DC59EA321D91CA2C001BDDF5 /* printFields.c in Sources */,
-                               DC59EA2E1D91CA2C001BDDF5 /* libDERUtils.c in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               DC59EA331D91CA82001BDDF5 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               DC59EA4E1D91CACE001BDDF5 /* parseCert.c in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               DC59EA571D91CAF0001BDDF5 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               DC59EA611D91CAFD001BDDF5 /* parseCrl.c in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               DC59EA671D91CB9F001BDDF5 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               DC59EA721D91CBBD001BDDF5 /* parseTicket.c in Sources */,
-                               DC59EA711D91CBB9001BDDF5 /* DER_Ticket.c in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                DC5ABDC11D832DAB00CF422C /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               DC71D9F01D95BB0A0065FB93 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               DC71D9F11D95BB0A0065FB93 /* DER_Decode.c in Sources */,
-                               DC71D9F21D95BB0A0065FB93 /* DER_Encode.c in Sources */,
-                               DC71D9F31D95BB0A0065FB93 /* DER_Keys.c in Sources */,
-                               DC71D9F41D95BB0A0065FB93 /* DER_Digest.c in Sources */,
-                               DC71D9F51D95BB0A0065FB93 /* oids.c in Sources */,
-                               DC71D9F61D95BB0A0065FB93 /* DER_CertCrl.c in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                DC8834031D8A218F00CE0ACA /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                                DCB342FA1D8A32A20054D16E /* SecACL.cpp in Sources */,
                                DCB342F91D8A32A20054D16E /* SecAccess.cpp in Sources */,
                                DCB342FB1D8A32A20054D16E /* SecBase.cpp in Sources */,
-                               DCB343891D8A32A20054D16E /* SecBase64P.c in Sources */,
                                DCB3435B1D8A32A20054D16E /* SecCFTypes.cpp in Sources */,
                                DCB342FD1D8A32A20054D16E /* SecCertificate.cpp in Sources */,
                                DCB342FE1D8A32A20054D16E /* SecCertificateBundle.cpp in Sources */,
-                               DCB3438B1D8A32A20054D16E /* SecCertificateP.c in Sources */,
                                DCB343921D8A32A20054D16E /* SecExport.cpp in Sources */,
                                DCB343931D8A32A20054D16E /* SecExternalRep.cpp in Sources */,
                                DCB343371D8A32A20054D16E /* SecFDERecoveryAsymmetricCrypto.cpp in Sources */,
-                               DCB3438A1D8A32A20054D16E /* SecFrameworkP.c in Sources */,
                                DCB343001D8A32A20054D16E /* SecIdentity.cpp in Sources */,
                                DCB343011D8A32A20054D16E /* SecIdentitySearch.cpp in Sources */,
                                DCB343951D8A32A20054D16E /* SecImport.cpp in Sources */,
                        buildActionMask = 2147483647;
                        files = (
                                0CAD1E581E1C5C6C00537693 /* SOSCloudCircle.m in Sources */,
-                               DCC78EE81D808B3500865A7C /* secToolFileIO.c in Sources */,
                                DCC78EE71D808B2F00865A7C /* secViewDisplay.c in Sources */,
                                DCC78EE61D808B2A00865A7C /* SecAccessControl.c in Sources */,
                                DCC78EE51D808B2100865A7C /* SecBase64.c in Sources */,
                                BEEB47D91EA189F5004AA5C6 /* SecTrustStatusCodes.c in Sources */,
                                DCC78EE21D808B0E00865A7C /* SecCTKKey.c in Sources */,
                                DCC78EE11D808B0900865A7C /* SecCertificate.c in Sources */,
-                               DCC78EE01D808B0000865A7C /* SecCertificatePath.c in Sources */,
                                DC4269041E82EDAC002B7110 /* SecItem.m in Sources */,
                                EBEEEE3D1EA31DB000E15F5C /* SOSControlHelper.m in Sources */,
                                DCC78EDF1D808AF800865A7C /* SecCertificateRequest.c in Sources */,
                                DCC78EC51D808A4100865A7C /* SecRSAKey.c in Sources */,
                                DCC78EC41D808A3B00865A7C /* SecSCEP.c in Sources */,
                                DCC78EC31D808A2E00865A7C /* SecServerEncryptionSupport.c in Sources */,
-                               48C2F93A1E4BCFDC0093D70C /* accountCirclesViewsPrint.m in Sources */,
                                DCC78EC21D808A2800865A7C /* SecSharedCredential.c in Sources */,
                                DCC78EC11D808A2200865A7C /* SecSignatureVerificationSupport.c in Sources */,
                                DCC78EC01D808A1C00865A7C /* SecTrust.c in Sources */,
                                DCD66DBF1D82053E00DB1393 /* SecDigest.c in Sources */,
                                BEEB47DA1EA189F5004AA5C6 /* SecTrustStatusCodes.c in Sources */,
                                DCD66DBE1D82053700DB1393 /* SecBase64.c in Sources */,
-                               DCD66DBD1D82053100DB1393 /* SecCertificatePath.c in Sources */,
+                               BE1F74D31F609D460068FA64 /* SecFramework.c in Sources */,
                                DCD66DB61D82050900DB1393 /* SecKey.c in Sources */,
                                DCD66DBC1D82052B00DB1393 /* SecKeyAdaptors.c in Sources */,
                                DCD66DBB1D82052700DB1393 /* SecPolicy.c in Sources */,
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               DCD8A1DA1E09F54700E4FA0A /* SOSAccountDer.m in Sources */,
-                               DCD8A1E31E09F7E700E4FA0A /* SOSAccountCloudParameters.m in Sources */,
                                DCD8A19D1E09EEC800E4FA0A /* SOSBackupSliceKeyBag.m in Sources */,
+                               DC2670FB1F3E72C000816EED /* SOSCircleDer.c in Sources */,
                                EB75B4961E75A44100E469CC /* SOSPiggyback.m in Sources */,
                                DCD8A1B31E09F12D00E4FA0A /* SOSCircle.c in Sources */,
-                               DCD8A1AC1E09F09200E4FA0A /* SOSCircleDer.c in Sources */,
                                DCD8A1FF1E09FA6100E4FA0A /* secViewDisplay.c in Sources */,
                                DCD8A1B41E09F12D00E4FA0A /* SOSCircleV2.c in Sources */,
                                DCD8A1A01E09EF3500E4FA0A /* SOSCloudKeychainClient.c in Sources */,
                                DCD8A1A91E09F04700E4FA0A /* SOSECWrapUnwrap.c in Sources */,
                                0C4899251E0F38FA00C6CF70 /* SOSAccountTrustOctagon.m in Sources */,
                                DCD8A1BD1E09F1D600E4FA0A /* SOSFullPeerInfo.m in Sources */,
-                               DCD8A2001E09FA7900E4FA0A /* secToolFileIO.c in Sources */,
                                DCD8A1B51E09F15400E4FA0A /* SOSGenCount.c in Sources */,
                                DCD8A19F1E09EF0F00E4FA0A /* SOSInternal.m in Sources */,
                                EBEEEE3F1EA31E6D00E15F5C /* SOSControlHelper.m in Sources */,
                                0CE7604E1E12F5BA00B4381E /* SOSAccountTrustClassic+Retirement.m in Sources */,
                                DCD8A1A51E09EFAE00E4FA0A /* SOSPeerInfoV2.m in Sources */,
                                0CE760481E12F2F300B4381E /* SOSAccountTrustClassic+Expansion.m in Sources */,
-                               48C2F9391E4BCFDA0093D70C /* accountCirclesViewsPrint.m in Sources */,
                                DCD8A1C21E09F23B00E4FA0A /* SOSRecoveryKeyBag.m in Sources */,
                                DCD8A1B81E09F1BB00E4FA0A /* SOSRingBackup.m in Sources */,
                                DCD8A1B91E09F1BB00E4FA0A /* SOSRingBasic.m in Sources */,
                                DCD8A1BA1E09F1BB00E4FA0A /* SOSRingRecovery.m in Sources */,
                                DCD8A1B01E09F0F400E4FA0A /* SOSRingTypes.m in Sources */,
                                DCD8A1AF1E09F0DC00E4FA0A /* SOSRingUtils.c in Sources */,
-                               0C48991C1E0F384700C6CF70 /* SOSAccountTrustClassic.m in Sources */,
                                DCD8A1B71E09F19100E4FA0A /* SOSRingV0.m in Sources */,
-                               DCD8A1A31E09EF7800E4FA0A /* SOSSysdiagnose.m in Sources */,
                                DCD8A1C71E09F2B400E4FA0A /* SOSTransport.m in Sources */,
-                               DCD8A1A81E09F03100E4FA0A /* SOSUserKeygen.m in Sources */,
                                DCD8A1511E09EE0F00E4FA0A /* SOSViews.m in Sources */,
                                DCD8A19E1E09EEDA00E4FA0A /* SecRecoveryKey.m in Sources */,
                                0CE7604A1E12F30200B4381E /* SOSAccountTrustClassic+Circle.m in Sources */,
                        files = (
                                DC5BCC481E53820200649140 /* SecArgParse.c in Sources */,
                                EB27FF2D1E407FF600EC9E3A /* ckksctl.m in Sources */,
-                               DCF7A8A51F0451AC00CABE89 /* CKKSControlProtocol.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
+               EB49B2AA202D877F003F34A0 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               EB49B2E5202DFEB3003F34A0 /* mockaks.m in Sources */,
+                               EB49B2DB202DF20F003F34A0 /* spi.c in Sources */,
+                               EB49B2D7202DF1F7003F34A0 /* server_endpoint.m in Sources */,
+                               EB49B2D8202DF1F7003F34A0 /* server_xpc.m in Sources */,
+                               EB49B2D9202DF1F7003F34A0 /* server_security_helpers.c in Sources */,
+                               EB49B2E0202DF5D7003F34A0 /* server_entitlement_helpers.c in Sources */,
+                               EB6667C7204CD69F000B404F /* testPlistDER.m in Sources */,
+                               EB49B2D5202DF1D8003F34A0 /* SecTask.c in Sources */,
+                               EB49B2D4202DF1C1003F34A0 /* client.c in Sources */,
+                               EB49B2D3202DF1AC003F34A0 /* SecdWatchdog.m in Sources */,
+                               EB49B2B1202D8780003F34A0 /* secdmockaks.m in Sources */,
+                               EB49B2D1202DF15F003F34A0 /* SFAnalyticsActivityTracker.m in Sources */,
+                               EB49B2D0202DF14D003F34A0 /* SFAnalytics.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                EB9C1D761BDFD0E000F89272 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        target = 0C0BDB2E175685B000BC1A7E /* secdtests_ios */;
                        targetProxy = 0C664AB31759270C0092D3D9 /* PBXContainerItemProxy */;
                };
+               0C78CCE51FCC97E7008B4B24 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 0C8BBEFD1FCB446400580909 /* otctl */;
+                       targetProxy = 0C78CCE41FCC97E7008B4B24 /* PBXContainerItemProxy */;
+               };
+               0C78CCE71FCC97F1008B4B24 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 0C8BBEFD1FCB446400580909 /* otctl */;
+                       targetProxy = 0C78CCE61FCC97F1008B4B24 /* PBXContainerItemProxy */;
+               };
+               0C85DFD41FB38BB6000343A7 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC222C371E034D1F00B09171 /* libsecurityd_ios_NO_AKS */;
+                       targetProxy = 0C85DFD51FB38BB6000343A7 /* PBXContainerItemProxy */;
+               };
+               0C85DFD81FB38BB6000343A7 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
+                       targetProxy = 0C85DFD91FB38BB6000343A7 /* PBXContainerItemProxy */;
+               };
+               0C85DFDA1FB38BB6000343A7 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = 0C85DFDB1FB38BB6000343A7 /* PBXContainerItemProxy */;
+               };
+               0C85DFDC1FB38BB6000343A7 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
+                       targetProxy = 0C85DFDD1FB38BB6000343A7 /* PBXContainerItemProxy */;
+               };
+               0C85DFDE1FB38BB6000343A7 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
+                       targetProxy = 0C85DFDF1FB38BB6000343A7 /* PBXContainerItemProxy */;
+               };
+               0C85DFE01FB38BB6000343A7 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCC78EA81D8088E200865A7C /* security */;
+                       targetProxy = 0C85DFE11FB38BB6000343A7 /* PBXContainerItemProxy */;
+               };
                0C99B740131C984900584CF4 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 0C6799F912F7C37C00712919 /* dtlsTests */;
                        target = 4381690B1B4EDCBD00C54D58 /* SOSCCAuthPlugin */;
                        targetProxy = 438169E61B4EE4B300C54D58 /* PBXContainerItemProxy */;
                };
+               478D426D1FD72A8100CAB645 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC52EDA61D80D58400B0A59C /* secdRegressions */;
+                       targetProxy = 478D426E1FD72A8100CAB645 /* PBXContainerItemProxy */;
+               };
+               478D426F1FD72A8100CAB645 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC0BCBD91D8C648C00070CB0 /* regressionBase */;
+                       targetProxy = 478D42701FD72A8100CAB645 /* PBXContainerItemProxy */;
+               };
+               478D42711FD72A8100CAB645 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
+                       targetProxy = 478D42721FD72A8100CAB645 /* PBXContainerItemProxy */;
+               };
+               478D42731FD72A8100CAB645 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCC78EA81D8088E200865A7C /* security */;
+                       targetProxy = 478D42741FD72A8100CAB645 /* PBXContainerItemProxy */;
+               };
                47C51B8B1EEA657D0032D9E5 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC1789031D77980500B50D50 /* Security_osx */;
                        targetProxy = 47C51B8A1EEA657D0032D9E5 /* PBXContainerItemProxy */;
                };
+               47DE88CE1FA7AD6200DD3254 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCC78EA81D8088E200865A7C /* security */;
+                       targetProxy = 47DE88CD1FA7AD6200DD3254 /* PBXContainerItemProxy */;
+               };
+               47DE88D51FA7AD7000DD3254 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
+                       targetProxy = 47DE88D41FA7AD7000DD3254 /* PBXContainerItemProxy */;
+               };
+               47DE88D71FA7ADAC00DD3254 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC0BCBD91D8C648C00070CB0 /* regressionBase */;
+                       targetProxy = 47DE88D61FA7ADAC00DD3254 /* PBXContainerItemProxy */;
+               };
+               47DE88D91FA7ADBB00DD3254 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC52EDA61D80D58400B0A59C /* secdRegressions */;
+                       targetProxy = 47DE88D81FA7ADBB00DD3254 /* PBXContainerItemProxy */;
+               };
                4C52D0EE16EFCD720079966E /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 4C52D0B316EFC61E0079966E /* CircleJoinRequested */;
                        target = 5346480017331E1100FE9172 /* KeychainSyncAccountNotification */;
                        targetProxy = 5346481A17331ED800FE9172 /* PBXContainerItemProxy */;
                };
-               5DDD0BEE16D6748900D6C0D6 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 728B56A016D59979008FA3AB /* OTAPKIAssetTool */;
-                       targetProxy = 5DDD0BED16D6748900D6C0D6 /* PBXContainerItemProxy */;
-               };
                5E10995419A5E80B00A60E2B /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 5E10992419A5E55800A60E2B /* ISACLProtectedItems */;
                        target = 6CCDF7831E3C25FA003F2555 /* KeychainEntitledTestRunner */;
                        targetProxy = 6C24EF521E415132000DE79F /* PBXContainerItemProxy */;
                };
-               6C98082D1E788AEB00E70590 /* PBXTargetDependency */ = {
+               6C7C38811FD88C4700DFFE68 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
-                       target = DC59E9AC1D91C9DC001BDDF5 /* DER_not_installed */;
-                       targetProxy = 6C98082E1E788AEB00E70590 /* PBXContainerItemProxy */;
+                       target = 6C46056B1F882B9B001421B6 /* KeychainAnalyticsTests */;
+                       targetProxy = 6C7C38801FD88C4700DFFE68 /* PBXContainerItemProxy */;
+               };
+               6C7C38881FD88C5A00DFFE68 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6C46056B1F882B9B001421B6 /* KeychainAnalyticsTests */;
+                       targetProxy = 6C7C38871FD88C5A00DFFE68 /* PBXContainerItemProxy */;
                };
                6C98082F1E788AEB00E70590 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC222C371E034D1F00B09171 /* libsecurityd_ios_NO_AKS */;
                        targetProxy = 6C98083C1E788AEB00E70590 /* PBXContainerItemProxy */;
                };
-               6C9808691E788AFD00E70590 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC59E9AC1D91C9DC001BDDF5 /* DER_not_installed */;
-                       targetProxy = 6C98086A1E788AFD00E70590 /* PBXContainerItemProxy */;
-               };
                6C98086B1E788AFD00E70590 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
                        target = 6CF4A0DF1E4549F200ECD7B5 /* KeychainEntitledTestApp_ios */;
                        targetProxy = 6C9808A31E788CB100E70590 /* PBXContainerItemProxy */;
                };
+               6C9A49B21FAB647D00239D58 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = 6C9A49B11FAB647D00239D58 /* PBXContainerItemProxy */;
+               };
+               6CAA8CE51F82FD08007B6E03 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6C9AA79D1F7C1D8F00D08296 /* supdctl */;
+                       targetProxy = 6CAA8CE41F82FD08007B6E03 /* PBXContainerItemProxy */;
+               };
+               6CAA8CE91F82FD13007B6E03 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6C9AA79D1F7C1D8F00D08296 /* supdctl */;
+                       targetProxy = 6CAA8CE81F82FD13007B6E03 /* PBXContainerItemProxy */;
+               };
+               6CAA8D3D1F8431BC007B6E03 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6CAA8D1F1F842FB3007B6E03 /* securityuploadd */;
+                       targetProxy = 6CAA8D3C1F8431BC007B6E03 /* PBXContainerItemProxy */;
+               };
+               6CAA8D3F1F8431C9007B6E03 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6CAA8D1F1F842FB3007B6E03 /* securityuploadd */;
+                       targetProxy = 6CAA8D3E1F8431C9007B6E03 /* PBXContainerItemProxy */;
+               };
                ACBAF6FE1E941E090007BA2F /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = ACBAF6991E9417F40007BA2F /* security_transform_regressions */;
                        target = D4ADA3181E2B41670031CEA3 /* libtrustd */;
                        targetProxy = D40B6A941E2B67FF00CD6EE5 /* PBXContainerItemProxy */;
                };
-               D41257E41E941A8400781F23 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC59E9AC1D91C9DC001BDDF5 /* DER_not_installed */;
-                       targetProxy = D41257E31E941A8400781F23 /* PBXContainerItemProxy */;
-               };
                D41257E61E941ACC00781F23 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC0BCC211D8C684F00070CB0 /* utilities */;
                        target = 52D82BDD16A621F70078DFE5 /* CloudKeychainProxy */;
                        targetProxy = D41AD4511B9788B2008C7270 /* PBXContainerItemProxy */;
                };
-               D41AD45A1B978944008C7270 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 728B56A016D59979008FA3AB /* OTAPKIAssetTool */;
-                       targetProxy = D41AD4591B978944008C7270 /* PBXContainerItemProxy */;
-               };
                D41AD45C1B978A7A008C7270 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 790851B50CA9859F0083CC4D /* securityd_ios */;
                        target = 5EBE24791B00CCAE0007DB0E /* secacltests */;
                        targetProxy = D41AD46D1B978F4C008C7270 /* PBXContainerItemProxy */;
                };
-               D41AD4721B978F76008C7270 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 728B56A016D59979008FA3AB /* OTAPKIAssetTool */;
-                       targetProxy = D41AD4711B978F76008C7270 /* PBXContainerItemProxy */;
-               };
                DA30D6821DF8C93500EC6B43 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DA30D6751DF8C8FB00EC6B43 /* KeychainSyncAccountUpdater */;
                        target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
                        targetProxy = DC0984FF1E1DB70A00140ADC /* PBXContainerItemProxy */;
                };
-               DC0B62961D90B6DB00D43BCB /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC1785041D77873100B50D50 /* copyHeadersToSystem */;
-                       targetProxy = DC0B62951D90B6DB00D43BCB /* PBXContainerItemProxy */;
-               };
                DC0BB4441ED4D74A0035F886 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DCC78EA81D8088E200865A7C /* security */;
                        target = DC222C371E034D1F00B09171 /* libsecurityd_ios_NO_AKS */;
                        targetProxy = DC222C781E034EE700B09171 /* PBXContainerItemProxy */;
                };
-               DC3502C41E020D4D00BC0587 /* PBXTargetDependency */ = {
+               DC2671101F3E933700816EED /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
-                       targetProxy = DC3502C31E020D4D00BC0587 /* PBXContainerItemProxy */;
+                       targetProxy = DC26710F1F3E933700816EED /* PBXContainerItemProxy */;
                };
-               DC3502C71E020D5600BC0587 /* PBXTargetDependency */ = {
+               DC34CD2D20326C2C00302481 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
-                       target = DC59E9AC1D91C9DC001BDDF5 /* DER_not_installed */;
-                       targetProxy = DC3502C61E020D5600BC0587 /* PBXContainerItemProxy */;
+                       target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
+                       targetProxy = DC34CD2C20326C2C00302481 /* PBXContainerItemProxy */;
+               };
+               DC34CD3420326C3100302481 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
+                       targetProxy = DC34CD3320326C3100302481 /* PBXContainerItemProxy */;
+               };
+               DC34CD3620326C3B00302481 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = DC34CD3520326C3B00302481 /* PBXContainerItemProxy */;
+               };
+               DC3502C41E020D4D00BC0587 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
+                       targetProxy = DC3502C31E020D4D00BC0587 /* PBXContainerItemProxy */;
                };
                DC3502CE1E020E2200BC0587 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        name = libCMS;
                        targetProxy = DC59E9A81D91C7CC001BDDF5 /* PBXContainerItemProxy */;
                };
-               DC59EA411D91CAAA001BDDF5 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC59E9AC1D91C9DC001BDDF5 /* DER_not_installed */;
-                       targetProxy = DC59EA401D91CAAA001BDDF5 /* PBXContainerItemProxy */;
-               };
-               DC59EA431D91CAAE001BDDF5 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC59EA0E1D91CA15001BDDF5 /* DERUtils */;
-                       targetProxy = DC59EA421D91CAAE001BDDF5 /* PBXContainerItemProxy */;
-               };
-               DC59EA531D91CAF0001BDDF5 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC59EA0E1D91CA15001BDDF5 /* DERUtils */;
-                       targetProxy = DC59EA541D91CAF0001BDDF5 /* PBXContainerItemProxy */;
-               };
-               DC59EA551D91CAF0001BDDF5 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC59E9AC1D91C9DC001BDDF5 /* DER_not_installed */;
-                       targetProxy = DC59EA561D91CAF0001BDDF5 /* PBXContainerItemProxy */;
-               };
-               DC59EA651D91CB9F001BDDF5 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC59E9AC1D91C9DC001BDDF5 /* DER_not_installed */;
-                       targetProxy = DC59EA661D91CB9F001BDDF5 /* PBXContainerItemProxy */;
-               };
-               DC59EA761D91CC5E001BDDF5 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC59E9AC1D91C9DC001BDDF5 /* DER_not_installed */;
-                       targetProxy = DC59EA751D91CC5E001BDDF5 /* PBXContainerItemProxy */;
-               };
-               DC59EA791D91CC78001BDDF5 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC59E9AC1D91C9DC001BDDF5 /* DER_not_installed */;
-                       targetProxy = DC59EA781D91CC78001BDDF5 /* PBXContainerItemProxy */;
-               };
-               DC59EA7D1D91CCAA001BDDF5 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC59E9AC1D91C9DC001BDDF5 /* DER_not_installed */;
-                       targetProxy = DC59EA7C1D91CCAA001BDDF5 /* PBXContainerItemProxy */;
-               };
-               DC59EA811D91CD16001BDDF5 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC59E9AC1D91C9DC001BDDF5 /* DER_not_installed */;
-                       targetProxy = DC59EA801D91CD16001BDDF5 /* PBXContainerItemProxy */;
-               };
-               DC59EA841D91CD2C001BDDF5 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC59E9AC1D91C9DC001BDDF5 /* DER_not_installed */;
-                       targetProxy = DC59EA831D91CD2C001BDDF5 /* PBXContainerItemProxy */;
-               };
-               DC59EA871D91CD76001BDDF5 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC59E9AC1D91C9DC001BDDF5 /* DER_not_installed */;
-                       targetProxy = DC59EA861D91CD76001BDDF5 /* PBXContainerItemProxy */;
-               };
-               DC59EA8A1D91CD89001BDDF5 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC59E9AC1D91C9DC001BDDF5 /* DER_not_installed */;
-                       targetProxy = DC59EA891D91CD89001BDDF5 /* PBXContainerItemProxy */;
-               };
-               DC59EA8D1D91CDB9001BDDF5 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC59E9AC1D91C9DC001BDDF5 /* DER_not_installed */;
-                       targetProxy = DC59EA8C1D91CDB9001BDDF5 /* PBXContainerItemProxy */;
-               };
-               DC59EA901D91CDC6001BDDF5 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC59E9AC1D91C9DC001BDDF5 /* DER_not_installed */;
-                       targetProxy = DC59EA8F1D91CDC6001BDDF5 /* PBXContainerItemProxy */;
-               };
-               DC59EA931D91CDD6001BDDF5 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC59E9AC1D91C9DC001BDDF5 /* DER_not_installed */;
-                       targetProxy = DC59EA921D91CDD6001BDDF5 /* PBXContainerItemProxy */;
-               };
-               DC59EA961D91CDEE001BDDF5 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC59E9AC1D91C9DC001BDDF5 /* DER_not_installed */;
-                       targetProxy = DC59EA951D91CDEE001BDDF5 /* PBXContainerItemProxy */;
-               };
-               DC59EA991D91CE8C001BDDF5 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC59E9AC1D91C9DC001BDDF5 /* DER_not_installed */;
-                       targetProxy = DC59EA981D91CE8C001BDDF5 /* PBXContainerItemProxy */;
-               };
                DC5ABE1C1D832F5E00CF422C /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC5ABDC41D832DAB00CF422C /* securitytool_macos */;
                        target = DC5AC04F1D8352D900CF422C /* securityd_macos */;
                        targetProxy = DC5AC12E1D8356DA00CF422C /* PBXContainerItemProxy */;
                };
-               DC5AC1341D835C2300CF422C /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC1785041D77873100B50D50 /* copyHeadersToSystem */;
-                       targetProxy = DC5AC1331D835C2300CF422C /* PBXContainerItemProxy */;
-               };
                DC61096B1D78E60C002223DE /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 5EBE24791B00CCAE0007DB0E /* secacltests */;
                        target = DC71D99F1D95BA6C0065FB93 /* ASN1 */;
                        targetProxy = DC71D9E21D95BAD50065FB93 /* PBXContainerItemProxy */;
                };
-               DC71D9FD1D95BB440065FB93 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC71D9E41D95BB0A0065FB93 /* DER */;
-                       targetProxy = DC71D9FC1D95BB440065FB93 /* PBXContainerItemProxy */;
-               };
                DC71DA031D95BDEA0065FB93 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
                        target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
                        targetProxy = DC71DA061D95BE2F0065FB93 /* PBXContainerItemProxy */;
                };
-               DC71DA091D95BEE00065FB93 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC59E9AC1D91C9DC001BDDF5 /* DER_not_installed */;
-                       targetProxy = DC71DA081D95BEE00065FB93 /* PBXContainerItemProxy */;
-               };
-               DC71DA0B1D95BEF60065FB93 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC59E9AC1D91C9DC001BDDF5 /* DER_not_installed */;
-                       targetProxy = DC71DA0A1D95BEF60065FB93 /* PBXContainerItemProxy */;
-               };
                DC71DA0D1D95DD670065FB93 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
                        target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
                        targetProxy = DC89998A1E410DBF00E6E604 /* PBXContainerItemProxy */;
                };
+               DCB332471F47857D00178C30 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC52EC211D80CFB200B0A59C /* SOSCommands */;
+                       targetProxy = DCB332461F47857D00178C30 /* PBXContainerItemProxy */;
+               };
                DCB340191D8A248C0054D16E /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
                        target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
                        targetProxy = DCD8A2061E09FB1F00E4FA0A /* PBXContainerItemProxy */;
                };
+               DCDB29761FD8839F00B5D242 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 0C85DFD11FB38BB6000343A7 /* OTTests */;
+                       targetProxy = DCDB29751FD8839F00B5D242 /* PBXContainerItemProxy */;
+               };
+               DCDB29781FD883AB00B5D242 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 0C85DFD11FB38BB6000343A7 /* OTTests */;
+                       targetProxy = DCDB29771FD883AB00B5D242 /* PBXContainerItemProxy */;
+               };
                DCE4E6AA1D7A38E700AFB96E /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DCE4E68A1D7A37FA00AFB96E /* security2tool_macos */;
                        target = DCE4E9101D7F3D5300AFB96E /* Keychain Circle Notification */;
                        targetProxy = DCE4E9721D7F3FC200AFB96E /* PBXContainerItemProxy */;
                };
+               DCE5DC171EA804E5006308A6 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC52EC211D80CFB200B0A59C /* SOSCommands */;
+                       targetProxy = DCE5DC161EA804E5006308A6 /* PBXContainerItemProxy */;
+               };
                DCF785011D88B80600E694BB /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DCF7830A1D88B4DE00E694BB /* security_apple_csp */;
                        target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
                        targetProxy = EBFBC2B51E76587800A34469 /* PBXContainerItemProxy */;
                };
-               EBFBC2B81E76588200A34469 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC59E9AC1D91C9DC001BDDF5 /* DER_not_installed */;
-                       targetProxy = EBFBC2B71E76588200A34469 /* PBXContainerItemProxy */;
-               };
                EBFBC2BA1E76588A00A34469 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
                        name = InfoPlist.strings;
                        sourceTree = "<group>";
                };
+               D479F6DF1F980F8F00388D28 /* Trust.strings */ = {
+                       isa = PBXVariantGroup;
+                       children = (
+                               D479F6E01F980F8F00388D28 /* English */,
+                       );
+                       name = Trust.strings;
+                       sourceTree = "<group>";
+               };
+               D4C263CC1F952F6C001317EA /* SecErrorMessages.strings */ = {
+                       isa = PBXVariantGroup;
+                       children = (
+                               D4C263CD1F952F6C001317EA /* SecErrorMessages.strings */,
+                       );
+                       name = SecErrorMessages.strings;
+                       path = derived_src/en.lproj/;
+                       sourceTree = BUILT_PRODUCTS_DIR;
+               };
                DC0B622D1D909C4600D43BCB /* MainMenu.xib */ = {
                        isa = PBXVariantGroup;
                        children = (
                                );
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INSTALL_PATH = /usr/local/bin;
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(SDKROOT)/usr/lib/system",
-                               );
                                OTHER_LDFLAGS = (
                                        "-ObjC",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_MOBILEASSET)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                "OTHER_LDFLAGS[sdk=embedded]" = (
                                        "$(inherited)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "-framework",
                                        CrashReporterSupport,
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                PRODUCT_NAME = secdtests;
                                STRIP_STYLE = debugging;
                                );
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INSTALL_PATH = /usr/local/bin;
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(SDKROOT)/usr/lib/system",
-                               );
                                OTHER_LDFLAGS = (
                                        "-ObjC",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_MOBILEASSET)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                "OTHER_LDFLAGS[sdk=embedded]" = (
                                        "$(inherited)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "-framework",
                                        CrashReporterSupport,
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                PRODUCT_NAME = secdtests;
                                STRIP_STYLE = debugging;
                        };
                        name = Release;
                };
+               0C85E0011FB38BB6000343A7 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_IDENTITY = "";
+                               FRAMEWORK_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/../../AppleInternal/Library/Frameworks",
+                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
+                               );
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "NO_SERVER=1",
+                                       "$(inherited)",
+                               );
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INFOPLIST_FILE = "keychain/ot/tests/OTTests-Info.plist";
+                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security/;
+                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+                               "LD_RUNPATH_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+                               "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               OTHER_LDFLAGS = (
+                                       "$(APPLE_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
+                                       "$(OTHER_LDFLAGS_PROTOBUF)",
+                                       "$(OTHER_LDFLAGS_MOBILEGESTALT)",
+                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",
+                                       "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
+                                       "$(OTHER_LDFLAGS_APS)",
+                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
+                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
+                                       "-ObjC",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                               );
+                               "OTHER_LDFLAGS[sdk=iphoneos*]" = (
+                                       "$(APPLE_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
+                                       "$(OTHER_LDFLAGS_PROTOBUF)",
+                                       "$(OTHER_LDFLAGS_MOBILEGESTALT)",
+                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",
+                                       "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
+                                       "$(OTHER_LDFLAGS_APS)",
+                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
+                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
+                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
+                                       "-ObjC",
+                                       "-framework",
+                                       CrashReporterSupport,
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                               );
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.OTTests;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               USE_XCTRUNNER = YES;
+                       };
+                       name = Debug;
+               };
+               0C85E0021FB38BB6000343A7 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_IDENTITY = "";
+                               FRAMEWORK_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/../../AppleInternal/Library/Frameworks",
+                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
+                               );
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "NO_SERVER=1",
+                                       "$(inherited)",
+                               );
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INFOPLIST_FILE = "keychain/ot/tests/OTTests-Info.plist";
+                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security/;
+                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+                               "LD_RUNPATH_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+                               "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               OTHER_LDFLAGS = (
+                                       "$(APPLE_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
+                                       "$(OTHER_LDFLAGS_PROTOBUF)",
+                                       "$(OTHER_LDFLAGS_MOBILEGESTALT)",
+                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",
+                                       "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
+                                       "$(OTHER_LDFLAGS_APS)",
+                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
+                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
+                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
+                                       "-ObjC",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                               );
+                               "OTHER_LDFLAGS[sdk=iphoneos*]" = (
+                                       "$(APPLE_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
+                                       "$(OTHER_LDFLAGS_PROTOBUF)",
+                                       "$(OTHER_LDFLAGS_MOBILEGESTALT)",
+                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",
+                                       "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
+                                       "$(OTHER_LDFLAGS_APS)",
+                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
+                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
+                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
+                                       "-ObjC",
+                                       "-framework",
+                                       CrashReporterSupport,
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                               );
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.OTTests;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               USE_XCTRUNNER = YES;
+                               VALIDATE_PRODUCT = YES;
+                       };
+                       name = Release;
+               };
+               0C8BBF061FCB446400580909 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_ENTITLEMENTS = "keychain/otctl/otctl-Entitlements.plist";
+                               GCC_C_LANGUAGE_STANDARD = gnu99;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INSTALL_PATH = /usr/local/bin;
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;
+               };
+               0C8BBF071FCB446400580909 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_ENTITLEMENTS = "keychain/otctl/otctl-Entitlements.plist";
+                               COPY_PHASE_STRIP = NO;
+                               ENABLE_NS_ASSERTIONS = NO;
+                               GCC_C_LANGUAGE_STANDARD = gnu99;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INSTALL_PATH = /usr/local/bin;
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Release;
+               };
                225394B21E3080A600D3CD9B /* Debug */ = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = D47C56AB1DCA831C00E18518 /* lib_ios_x64.xcconfig */;
                                        "$(PROJECT_DIR)/OSX/libsecurity_asn1",
                                        "$(PROJECT_DIR)/OSX/libsecurity_ssl",
                                        "$(PROJECT_DIR)/OSX/regressions",
-                                       "$(PROJECT_DIR)/OSX/ibsecurity_keychain/libDER",
+                                       "$(SDKROOT)/usr/local/include/security_libDER",
                                        "$(DSTROOT)/usr/local/include",
                                        "${BUILT_PRODUCTS_DIR}/cstemp/**",
                                );
                                        "$(PROJECT_DIR)/OSX/libsecurity_asn1",
                                        "$(PROJECT_DIR)/OSX/libsecurity_ssl",
                                        "$(PROJECT_DIR)/OSX/regressions",
-                                       "$(PROJECT_DIR)/OSX/ibsecurity_keychain/libDER",
+                                       "$(SDKROOT)/usr/local/include/security_libDER",
                                        "$(DSTROOT)/usr/local/include",
                                        "${BUILT_PRODUCTS_DIR}/cstemp/**",
                                );
                        };
                        name = Release;
                };
+               4727FBBC1F9918590003AE36 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+                               CLANG_WARN_COMMA = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_STRICT_PROTOTYPES = NO;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_ENTITLEMENTS = "secdtests/secdtests-entitlements.plist";
+                               CODE_SIGN_IDENTITY = "-";
+                               CODE_SIGN_STYLE = Automatic;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               FRAMEWORK_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
+                               );
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INFOPLIST_FILE = secdxctests/Info.plist;
+                               IPHONEOS_DEPLOYMENT_TARGET = 11.3;
+                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.secdxctests;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = iphoneos.internal;
+                               TARGETED_DEVICE_FAMILY = "1,2";
+                       };
+                       name = Debug;
+               };
+               4727FBBD1F9918590003AE36 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+                               CLANG_WARN_COMMA = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_STRICT_PROTOTYPES = NO;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_ENTITLEMENTS = "secdtests/secdtests-entitlements.plist";
+                               CODE_SIGN_IDENTITY = "-";
+                               CODE_SIGN_STYLE = Automatic;
+                               COPY_PHASE_STRIP = NO;
+                               ENABLE_NS_ASSERTIONS = NO;
+                               FRAMEWORK_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
+                               );
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INFOPLIST_FILE = secdxctests/Info.plist;
+                               IPHONEOS_DEPLOYMENT_TARGET = 11.3;
+                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.secdxctests;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = iphoneos.internal;
+                               TARGETED_DEVICE_FAMILY = "1,2";
+                               VALIDATE_PRODUCT = YES;
+                       };
+                       name = Release;
+               };
                47702B231E5F409700B29577 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                        };
                        name = Release;
                };
+               478D429A1FD72A8100CAB645 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+                               CLANG_WARN_COMMA = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_STRICT_PROTOTYPES = NO;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_ENTITLEMENTS = "secdtests/secdtests-entitlements.plist";
+                               CODE_SIGN_IDENTITY = "-";
+                               CODE_SIGN_STYLE = Automatic;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               FRAMEWORK_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
+                               );
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INFOPLIST_FILE = secdxctests/Info.plist;
+                               IPHONEOS_DEPLOYMENT_TARGET = 11.3;
+                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.secdxctests;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = macosx.internal;
+                               TARGETED_DEVICE_FAMILY = "1,2";
+                       };
+                       name = Debug;
+               };
+               478D429B1FD72A8100CAB645 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+                               CLANG_WARN_COMMA = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_STRICT_PROTOTYPES = NO;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_ENTITLEMENTS = "secdtests/secdtests-entitlements.plist";
+                               CODE_SIGN_IDENTITY = "-";
+                               CODE_SIGN_STYLE = Automatic;
+                               COPY_PHASE_STRIP = NO;
+                               ENABLE_NS_ASSERTIONS = NO;
+                               FRAMEWORK_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
+                               );
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INFOPLIST_FILE = secdxctests/Info.plist;
+                               IPHONEOS_DEPLOYMENT_TARGET = 11.3;
+                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.secdxctests;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = macosx.internal;
+                               TARGETED_DEVICE_FAMILY = "1,2";
+                               VALIDATE_PRODUCT = YES;
+                       };
+                       name = Release;
+               };
                47C51B8C1EEA657D0032D9E5 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INFOPLIST_FILE = SecurityUnitTests/Info.plist;
                                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-                               MACOSX_DEPLOYMENT_TARGET = 10.12;
                                MTL_ENABLE_DEBUG_INFO = YES;
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.SecurityUnitTests;
                                PRODUCT_NAME = "$(TARGET_NAME)";
-                               SDKROOT = macosx;
                        };
                        name = Debug;
                };
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INFOPLIST_FILE = SecurityUnitTests/Info.plist;
                                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-                               MACOSX_DEPLOYMENT_TARGET = 10.12;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.SecurityUnitTests;
                                PRODUCT_NAME = "$(TARGET_NAME)";
-                               SDKROOT = macosx;
                        };
                        name = Release;
                };
                                HEADER_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(PROJECT_DIR)",
-                                       "$(PROJECT_DIR)/OSX/libsecurity_keychain/libDER",
+                                       "$(SDKROOT)/usr/local/include/security_libDER",
                                        "$(PROJECT_DIR)/OSX/libsecurity_asn1",
                                        "$(PROJECT_DIR)/libsecurity_smime",
                                        "$(PROJECT_DIR)/OSX/sec/ProjectHeaders",
                                HEADER_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(PROJECT_DIR)",
-                                       "$(PROJECT_DIR)/OSX/libsecurity_keychain/libDER",
+                                       "$(SDKROOT)/usr/local/include/security_libDER",
                                        "$(PROJECT_DIR)/OSX/libsecurity_asn1",
                                        "$(PROJECT_DIR)/libsecurity_smime",
                                        "$(PROJECT_DIR)/OSX/sec/ProjectHeaders",
                                        "$(PROJECT_DIR)/OSX/regressions",
                                );
                                INFOPLIST_FILE = "SecurityTests/SecurityDevTests-Info.plist";
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "\"$(SDKROOT)/usr/lib/system\"",
-                               );
                                OTHER_LDFLAGS = (
                                        "$(inherited)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                "OTHER_LDFLAGS[sdk=embedded][arch=*]" = (
                                        "$(inherited)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:identifier}";
                                PRODUCT_NAME = SecurityDevTests;
                                        "$(PROJECT_DIR)/OSX/regressions",
                                );
                                INFOPLIST_FILE = "SecurityTests/SecurityDevTests-Info.plist";
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "\"$(SDKROOT)/usr/lib/system\"",
-                               );
                                OTHER_LDFLAGS = (
                                        "$(inherited)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                "OTHER_LDFLAGS[sdk=embedded]" = (
                                        "$(inherited)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:identifier}";
                                PRODUCT_NAME = SecurityDevTests;
                                        "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                );
                                INSTALL_PATH = /usr/local/bin;
-                               LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/local/lib";
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/usr/local/lib",
+                               );
                                OTHER_LDFLAGS = (
                                        "$(APPLE_AKS_LIBRARY)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "$(OTHER_LDFLAGS_AGGREGATEDICTIONARY)",
                                        "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
                                );
                                "OTHER_LDFLAGS[sdk=embedded]" = (
                                        "$(inherited)",
                                        "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                );
                                INSTALL_PATH = /usr/local/bin;
-                               LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/local/lib";
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/usr/local/lib",
+                               );
                                OTHER_LDFLAGS = (
                                        "$(APPLE_AKS_LIBRARY)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "$(OTHER_LDFLAGS_AGGREGATEDICTIONARY)",
                                        "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
                                );
                                "OTHER_LDFLAGS[sdk=embedded]" = (
                                        "$(inherited)",
                        };
                        name = Release;
                };
+               6C4605B61F882B9B001421B6 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_IDENTITY = "";
+                               FRAMEWORK_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/../../AppleInternal/Library/Frameworks",
+                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
+                               );
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INFOPLIST_FILE = "$(SRCROOT)/supd/Tests/Info.plist";
+                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security/;
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               OTHER_LDFLAGS = (
+                                       "-ObjC",
+                                       "$(AOSKIT_FRAMEWORK)",
+                                       "$(OTHER_LDFLAGS_CRASHREPORTER)",
+                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                               );
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.KeychainAnalyticsTests;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;
+               };
+               6C4605B71F882B9B001421B6 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_IDENTITY = "";
+                               FRAMEWORK_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/../../AppleInternal/Library/Frameworks",
+                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
+                               );
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INFOPLIST_FILE = "$(SRCROOT)/supd/Tests/Info.plist";
+                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security/;
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               OTHER_LDFLAGS = (
+                                       "-ObjC",
+                                       "$(AOSKIT_FRAMEWORK)",
+                                       "$(OTHER_LDFLAGS_CRASHREPORTER)",
+                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                               );
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.KeychainAnalyticsTests;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               VALIDATE_PRODUCT = YES;
+                       };
+                       name = Release;
+               };
                6C98085F1E788AEB00E70590 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                        "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                "OTHER_LDFLAGS[sdk=iphoneos*]" = (
                                        "$(APPLE_AKS_LIBRARY)",
                                        "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "-framework",
                                        CrashReporterSupport,
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.CKKSCloudKitTests;
                                PRODUCT_NAME = CKKSCloudKitTests;
                                        "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                "OTHER_LDFLAGS[sdk=iphoneos*]" = (
                                        "$(APPLE_AKS_LIBRARY)",
                                        "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "-framework",
                                        CrashReporterSupport,
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.CKKSCloudKitTests;
                                PRODUCT_NAME = CKKSCloudKitTests;
                                        "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                "OTHER_LDFLAGS[sdk=iphoneos*]" = (
                                        "$(APPLE_AKS_LIBRARY)",
                                        "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "-framework",
                                        CrashReporterSupport,
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.CKKSCloudKitTests;
                                PRODUCT_NAME = CKKSCloudKitTests;
                                        "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                "OTHER_LDFLAGS[sdk=iphoneos*]" = (
                                        "$(APPLE_AKS_LIBRARY)",
                                        "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "-framework",
                                        CrashReporterSupport,
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.CKKSCloudKitTests;
                                PRODUCT_NAME = CKKSCloudKitTests;
                        };
                        name = Release;
                };
+               6C9AA7A31F7C1D9000D08296 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+                               CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+                               CLANG_WARN_COMMA = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_STRICT_PROTOTYPES = YES;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/supdctl/supdctl-Entitlements.plist";
+                               CODE_SIGN_STYLE = Automatic;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INSTALL_PATH = /usr/local/bin;
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;
+               };
+               6C9AA7A41F7C1D9000D08296 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+                               CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+                               CLANG_WARN_COMMA = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_STRICT_PROTOTYPES = YES;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/supdctl/supdctl-Entitlements.plist";
+                               CODE_SIGN_STYLE = Automatic;
+                               COPY_PHASE_STRIP = NO;
+                               ENABLE_NS_ASSERTIONS = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INSTALL_PATH = /usr/local/bin;
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Release;
+               };
+               6CAA8D251F842FB4007B6E03 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+                               CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+                               CLANG_WARN_COMMA = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_STRICT_PROTOTYPES = YES;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/supd/securityuploadd-Entitlements.plist";
+                               CODE_SIGN_STYLE = Automatic;
+                               FRAMEWORK_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
+                               );
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INSTALL_PATH = /usr/libexec;
+                               "LAUNCHD_PLIST[sdk=iphoneos*]" = "$(SRCROOT)/supd/securityuploadd-ios.plist";
+                               "LAUNCHD_PLIST[sdk=iphonesimulator*]" = "$(SRCROOT)/supd/securityuploadd-ios.plist";
+                               "LAUNCHD_PLIST[sdk=macosx*]" = "$(SRCROOT)/supd/securityuploadd-osx.plist";
+                               "LAUNCHD_PLIST_LOCATION[sdk=iphoneos*]" = "$(DSTROOT)/System/Library/LaunchDaemons";
+                               "LAUNCHD_PLIST_LOCATION[sdk=iphonesimulator*]" = "$(DSTROOT)/System/Library/LaunchDaemons";
+                               "LAUNCHD_PLIST_LOCATION[sdk=macosx*]" = "$(DSTROOT)/System/Library/LaunchAgents";
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               OTHER_LDFLAGS = (
+                                       "$(AOSKIT_FRAMEWORK)",
+                                       "$(OTHER_LDFLAGS_CRASHREPORTER)",
+                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                               );
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;
+               };
+               6CAA8D261F842FB4007B6E03 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+                               CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+                               CLANG_WARN_COMMA = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_STRICT_PROTOTYPES = YES;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/supd/securityuploadd-Entitlements.plist";
+                               CODE_SIGN_STYLE = Automatic;
+                               COPY_PHASE_STRIP = NO;
+                               ENABLE_NS_ASSERTIONS = NO;
+                               FRAMEWORK_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
+                               );
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INSTALL_PATH = /usr/libexec;
+                               "LAUNCHD_PLIST[sdk=iphoneos*]" = "$(SRCROOT)/supd/securityuploadd-ios.plist";
+                               "LAUNCHD_PLIST[sdk=iphonesimulator*]" = "$(SRCROOT)/supd/securityuploadd-ios.plist";
+                               "LAUNCHD_PLIST[sdk=macosx*]" = "$(SRCROOT)/supd/securityuploadd-osx.plist";
+                               "LAUNCHD_PLIST_LOCATION[sdk=iphoneos*]" = "$(DSTROOT)/System/Library/LaunchDaemons";
+                               "LAUNCHD_PLIST_LOCATION[sdk=iphonesimulator*]" = "$(DSTROOT)/System/Library/LaunchDaemons";
+                               "LAUNCHD_PLIST_LOCATION[sdk=macosx*]" = "$(DSTROOT)/System/Library/LaunchAgents";
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               OTHER_LDFLAGS = (
+                                       "$(AOSKIT_FRAMEWORK)",
+                                       "$(OTHER_LDFLAGS_CRASHREPORTER)",
+                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                               );
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Release;
+               };
                6CCDF7891E3C25FB003F2555 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
                                LD_RUNPATH_SEARCH_PATHS = "/Developer/Library/Frameworks /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/Library/Frameworks /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/Library/Frameworks/XCTest.framework/Frameworks";
-                               MACOSX_DEPLOYMENT_TARGET = 10.13;
                                MTL_ENABLE_DEBUG_INFO = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
-                               SDKROOT = macosx.internal;
                        };
                        name = Debug;
                };
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
                                LD_RUNPATH_SEARCH_PATHS = "/Developer/Library/Frameworks /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/Library/Frameworks /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/Library/Frameworks/XCTest.framework/Frameworks";
-                               MACOSX_DEPLOYMENT_TARGET = 10.13;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_NAME = "$(TARGET_NAME)";
-                               SDKROOT = macosx.internal;
                        };
                        name = Release;
                };
                                INFOPLIST_FILE = KeychainEntitledTestApp_mac/Info.plist;
                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
                                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-                               MACOSX_DEPLOYMENT_TARGET = 10.13;
                                MTL_ENABLE_DEBUG_INFO = YES;
                                OTHER_CODE_SIGN_FLAGS = "--deep";
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.KeychainEntitledTestApp-mac";
                                INFOPLIST_FILE = KeychainEntitledTestApp_mac/Info.plist;
                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
                                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-                               MACOSX_DEPLOYMENT_TARGET = 10.13;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                OTHER_CODE_SIGN_FLAGS = "--deep";
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.KeychainEntitledTestApp-mac";
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/keychain/ckks/tests/testrunner/KeychainEntitledTestRunner-Entitlements.plist";
-                               "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "-";
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                GCC_C_LANGUAGE_STANDARD = gnu99;
                                GCC_DYNAMIC_NO_PIC = NO;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/keychain/ckks/tests/testrunner/KeychainEntitledTestRunner-Entitlements.plist";
-                               "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "-";
                                COPY_PHASE_STRIP = NO;
                                ENABLE_NS_ASSERTIONS = NO;
                                GCC_C_LANGUAGE_STANDARD = gnu99;
                        };
                        name = Release;
                };
-               728B56AC16D59979008FA3AB /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       baseConfigurationReference = 22C002A31AC9D33100B3469E /* OTAPKIAssetTool.xcconfig */;
-                       buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-                               CLANG_CXX_LIBRARY = "libc++";
-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CLANG_WARN_CONSTANT_CONVERSION = YES;
-                               CLANG_WARN_EMPTY_BODY = YES;
-                               CLANG_WARN_ENUM_CONVERSION = YES;
-                               CLANG_WARN_INT_CONVERSION = YES;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               CODE_SIGN_ENTITLEMENTS = "$(PROJECT_DIR)/OTAPKIAssetTool/OTAPKIAssetTool-entitlements.plist";
-                               CODE_SIGN_IDENTITY = "-";
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "DEBUG=1",
-                                       "$(inherited)",
-                               );
-                               GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-                               GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES;
-                               INSTALL_PATH = /usr/libexec;
-                               ONLY_ACTIVE_ARCH = YES;
-                               OTHER_LDFLAGS = "";
-                               "OTHER_LDFLAGS[sdk=embedded]" = (
-                                       "-framework",
-                                       BackgroundTaskAgent,
-                               );
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               SDKROOT = iphoneos.internal;
-                               "SKIP_INSTALL[sdk=embeddedsimulator*]" = YES;
-                       };
-                       name = Debug;
-               };
-               728B56AD16D59979008FA3AB /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       baseConfigurationReference = 22C002A31AC9D33100B3469E /* OTAPKIAssetTool.xcconfig */;
-                       buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-                               CLANG_CXX_LIBRARY = "libc++";
-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CLANG_WARN_CONSTANT_CONVERSION = YES;
-                               CLANG_WARN_EMPTY_BODY = YES;
-                               CLANG_WARN_ENUM_CONVERSION = YES;
-                               CLANG_WARN_INT_CONVERSION = YES;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               CODE_SIGN_ENTITLEMENTS = "$(PROJECT_DIR)/OTAPKIAssetTool/OTAPKIAssetTool-entitlements.plist";
-                               CODE_SIGN_IDENTITY = "-";
-                               ENABLE_NS_ASSERTIONS = NO;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
-                               INSTALL_PATH = /usr/libexec;
-                               OTHER_LDFLAGS = "";
-                               "OTHER_LDFLAGS[sdk=embedded]" = (
-                                       "-framework",
-                                       BackgroundTaskAgent,
-                               );
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               SDKROOT = iphoneos.internal;
-                               "SKIP_INSTALL[sdk=embeddedsimulator*]" = YES;
-                               VALIDATE_PRODUCT = YES;
-                       };
-                       name = Release;
-               };
                7913B20D0D172B3900601FE9 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                INFOPLIST_FILE = "Security-Info.plist";
                                INSTALLHDRS_SCRIPT_PHASE = YES;
                                INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/usr/local/lib/security_libDER",
+                               );
                                MODULEMAP_FILE = Modules/Security.iOS.modulemap;
                                OTHER_LDFLAGS = (
                                        "-laks",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                );
                                "OTHER_LDFLAGS[sdk=*simulator*]" = "-Wl,-upward_framework,Foundation";
+                               OTHER_TAPI_FLAGS = "-I$(PROJECT_DIR)/header_symlinks/iOS/ -extra-private-header $(PROJECT_DIR)/OSX/sec/Security/ios_tapi_hacks.h $(OTHER_TAPI_FLAGS_SECURITY_FRAMEWORK) $(inherited)";
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.${EXECUTABLE_NAME}";
                                PRODUCT_NAME = Security;
                                STRIP_STYLE = debugging;
+                               SUPPORTS_TEXT_BASED_API = YES;
                                Sim_Name = "";
                                "Sim_Name[sdk=embeddedsimulator*][arch=*]" = _sim;
                        };
                                INFOPLIST_FILE = "Security-Info.plist";
                                INSTALLHDRS_SCRIPT_PHASE = YES;
                                INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/usr/local/lib/security_libDER",
+                               );
                                MODULEMAP_FILE = Modules/Security.iOS.modulemap;
                                OTHER_LDFLAGS = (
                                        "-laks",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                );
                                "OTHER_LDFLAGS[sdk=*simulator*]" = "-Wl,-upward_framework,Foundation";
+                               OTHER_TAPI_FLAGS = "-I$(PROJECT_DIR)/header_symlinks/iOS/ -extra-private-header $(PROJECT_DIR)/OSX/sec/Security/ios_tapi_hacks.h $(OTHER_TAPI_FLAGS_SECURITY_FRAMEWORK) $(inherited)";
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.${EXECUTABLE_NAME}";
                                PRODUCT_NAME = Security;
                                STRIP_STYLE = debugging;
+                               SUPPORTS_TEXT_BASED_API = YES;
                                Sim_Name = "";
                                "Sim_Name[sdk=embeddedsimulator*][arch=*]" = _sim;
                        };
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                "OTHER_LDFLAGS[sdk=embedded][arch=*]" = (
                                        "-lsqlite3",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                PRODUCT_NAME = security;
                                STRIP_STYLE = debugging;
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                "OTHER_LDFLAGS[sdk=embeddedsimulator*][arch=*]" = (
                                        "-lsqlite3",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                PRODUCT_NAME = security;
                                STRIP_STYLE = debugging;
                                GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
                                INSTALL_PATH = /usr/libexec;
                                LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/local/lib";
+                               OTHER_CODE_SIGN_FLAGS = "$(OTHER_CODE_SIGN_FLAGS_LIBRARY_VALIDATION)";
                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                "OTHER_LDFLAGS[sdk=embedded][arch=*]" = (
                                        "$(OTHER_LDFLAGS)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "-framework",
                                        CrashReporterSupport,
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                "OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
                                        "$(inherited)",
                                GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
                                INSTALL_PATH = /usr/libexec;
                                LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/local/lib";
+                               OTHER_CODE_SIGN_FLAGS = "$(OTHER_CODE_SIGN_FLAGS_LIBRARY_VALIDATION)";
                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                "OTHER_LDFLAGS[sdk=embedded][arch=*]" = (
                                        "$(OTHER_LDFLAGS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "-framework",
                                        CrashReporterSupport,
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                "OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
                                        "$(inherited)",
                                "SECURITY_FRAMEWORK_RESOURCES_DIR[sdk=macosx*]" = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework/Versions/A/Resources";
                                STRIP_INSTALLED_PRODUCT = NO;
                                SUPPORTED_PLATFORMS = "iphonesimulator iphoneos watchos macosx appletvos appletvsimulator watchsimulator";
+                               SUPPORTS_TEXT_BASED_API = YES;
                                Sim_Name = "";
                                "Sim_Name[sdk=embeddedsimulator*][arch=*]" = _sim;
+                               TAPI_VERIFY_MODE = ErrorsAndWarnings;
                                TARGETED_DEVICE_FAMILY = "1,2";
                        };
                        name = Debug;
                                CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                CODE_SIGN_IDENTITY = "-";
-                               COPY_PHASE_STRIP = YES;
+                               COPY_PHASE_STRIP = NO;
                                DEAD_CODE_STRIPPING = YES;
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                SECURITY_FRAMEWORK_RESOURCES_DIR = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework/";
                                "SECURITY_FRAMEWORK_RESOURCES_DIR[sdk=macosx*]" = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework/Versions/A/Resources";
                                SUPPORTED_PLATFORMS = "iphonesimulator iphoneos watchos macosx appletvos appletvsimulator watchsimulator";
+                               SUPPORTS_TEXT_BASED_API = YES;
                                Sim_Name = "";
                                "Sim_Name[sdk=embeddedsimulator*][arch=*]" = _sim;
+                               TAPI_VERIFY_MODE = ErrorsAndWarnings;
                                TARGETED_DEVICE_FAMILY = "1,2";
                        };
                        name = Release;
                                INFOPLIST_FILE = keychain/trust/TrustedPeersTests/Info.plist;
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustedPeersTests;
                                PRODUCT_NAME = "$(TARGET_NAME)";
-                               VALID_ARCHS = "armv6 armv7 arm64 x86_64 x86_64h";
                        };
                        name = Debug;
                };
                                INFOPLIST_FILE = keychain/trust/TrustedPeersTests/Info.plist;
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustedPeersTests;
                                PRODUCT_NAME = "$(TARGET_NAME)";
-                               VALID_ARCHS = "armv6 armv7 arm64 x86_64 x86_64h";
                        };
                        name = Release;
                };
                                        "$(inherited)",
                                );
                                INSTALL_PATH = /usr/libexec;
-                               LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/local/lib";
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/usr/local/lib",
+                               );
                                MTL_ENABLE_DEBUG_INFO = YES;
                                OTHER_LDFLAGS = "$(OTHER_LDFLAGS_MOBILEASSET)";
                                "OTHER_LDFLAGS[sdk=embedded]" = (
                                        "$(inherited)",
                                );
                                INSTALL_PATH = /usr/libexec;
-                               LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/local/lib";
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/usr/local/lib",
+                               );
                                MTL_ENABLE_DEBUG_INFO = NO;
                                OTHER_LDFLAGS = "$(OTHER_LDFLAGS_MOBILEASSET)";
                                "OTHER_LDFLAGS[sdk=embedded]" = (
                                MTL_ENABLE_DEBUG_INFO = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SKIP_INSTALL = YES;
+                               STRIP_INSTALLED_PRODUCT = NO;
                                WARNING_CFLAGS = (
                                        "$(inherited)",
                                        "-Wno-unused-function",
                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SKIP_INSTALL = YES;
+                               STRIP_INSTALLED_PRODUCT = NO;
                                WARNING_CFLAGS = (
                                        "$(inherited)",
                                        "-Wno-unused-function",
                        };
                        name = Release;
                };
-               DC17850B1D77873200B50D50 /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-                               CLANG_CXX_LIBRARY = "libc++";
-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CLANG_WARN_BOOL_CONVERSION = YES;
-                               CLANG_WARN_CONSTANT_CONVERSION = YES;
-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-                               CLANG_WARN_EMPTY_BODY = YES;
-                               CLANG_WARN_ENUM_CONVERSION = YES;
-                               CLANG_WARN_INFINITE_RECURSION = YES;
-                               CLANG_WARN_INT_CONVERSION = YES;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_SUSPICIOUS_MOVES = YES;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               CODE_SIGN_IDENTITY = "";
-                               COMBINE_HIDPI_IMAGES = YES;
-                               CURRENT_PROJECT_VERSION = 1;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               DYLIB_INSTALL_NAME_BASE = "@rpath";
-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               FRAMEWORK_VERSION = A;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_NO_COMMON_BLOCKS = YES;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "DEBUG=1",
-                                       "$(inherited)",
-                               );
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-                               MTL_ENABLE_DEBUG_INFO = YES;
-                               PRODUCT_NAME = Security;
-                               SDKROOT = macosx.internal;
-                               VERSIONING_SYSTEM = "apple-generic";
-                               VERSION_INFO_PREFIX = "";
-                       };
-                       name = Debug;
-               };
-               DC17850C1D77873200B50D50 /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-                               CLANG_CXX_LIBRARY = "libc++";
-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CLANG_WARN_BOOL_CONVERSION = YES;
-                               CLANG_WARN_CONSTANT_CONVERSION = YES;
-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-                               CLANG_WARN_EMPTY_BODY = YES;
-                               CLANG_WARN_ENUM_CONVERSION = YES;
-                               CLANG_WARN_INFINITE_RECURSION = YES;
-                               CLANG_WARN_INT_CONVERSION = YES;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_SUSPICIOUS_MOVES = YES;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               CODE_SIGN_IDENTITY = "";
-                               COMBINE_HIDPI_IMAGES = YES;
-                               COPY_PHASE_STRIP = NO;
-                               CURRENT_PROJECT_VERSION = 1;
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               DYLIB_INSTALL_NAME_BASE = "@rpath";
-                               ENABLE_NS_ASSERTIONS = NO;
-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               FRAMEWORK_VERSION = A;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_NO_COMMON_BLOCKS = YES;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-                               MTL_ENABLE_DEBUG_INFO = NO;
-                               PRODUCT_NAME = Security;
-                               SDKROOT = macosx.internal;
-                               VERSIONING_SYSTEM = "apple-generic";
-                               VERSION_INFO_PREFIX = "";
-                       };
-                       name = Release;
-               };
                DC17890E1D77980500B50D50 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = DC178BB11D77A5F500B50D50 /* security_framework_macos.xcconfig */;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "DEBUG=1",
-                                       "$(inherited)",
-                               );
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                        "-Wl,-upward_framework,Foundation",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                );
+                               SUPPORTS_TEXT_BASED_API = YES;
+                               TAPI_VERIFY_MODE = ErrorsAndWarnings;
                                VERSIONING_SYSTEM = "apple-generic";
                        };
                        name = Debug;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                COPY_PHASE_STRIP = NO;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "NDEBUG=1",
-                                       "$(inherited)",
-                               );
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                        "-Wl,-upward_framework,Foundation",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                );
+                               SUPPORTS_TEXT_BASED_API = YES;
+                               TAPI_VERIFY_MODE = ErrorsAndWarnings;
                                VERSIONING_SYSTEM = "apple-generic";
                        };
                        name = Release;
                                        "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "-ObjC",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                "OTHER_LDFLAGS[sdk=iphoneos*]" = (
                                        "$(APPLE_AKS_LIBRARY)",
                                        "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "-ObjC",
                                        "-framework",
                                        CrashReporterSupport,
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.CKKSTests;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                        "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "-ObjC",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                "OTHER_LDFLAGS[sdk=iphoneos*]" = (
                                        "$(APPLE_AKS_LIBRARY)",
                                        "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "-ObjC",
                                        "-framework",
                                        CrashReporterSupport,
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.CKKSTests;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
                };
-               DC59E9EA1D91C9DC001BDDF5 /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       baseConfigurationReference = D47C56FB1DCA8F4900E18518 /* all_arches.xcconfig */;
-                       buildSettings = {
-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-                               CLANG_WARN_SUSPICIOUS_MOVES = YES;
-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               GENERATE_TEXT_BASED_STUBS = NO;
-                               INLINE_PRIVATE_FRAMEWORKS = NO;
-                               MTL_ENABLE_DEBUG_INFO = YES;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/security_libDER/libDER;
-                               SKIP_INSTALL = YES;
-                               SUPPORTS_TEXT_BASED_API = NO;
-                       };
-                       name = Debug;
-               };
-               DC59E9EB1D91C9DC001BDDF5 /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       baseConfigurationReference = D47C56FB1DCA8F4900E18518 /* all_arches.xcconfig */;
-                       buildSettings = {
-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-                               CLANG_WARN_SUSPICIOUS_MOVES = YES;
-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               GENERATE_TEXT_BASED_STUBS = NO;
-                               INLINE_PRIVATE_FRAMEWORKS = NO;
-                               MTL_ENABLE_DEBUG_INFO = NO;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/security_libDER/libDER;
-                               SKIP_INSTALL = YES;
-                               SUPPORTS_TEXT_BASED_API = NO;
-                       };
-                       name = Release;
-               };
-               DC59EA231D91CA15001BDDF5 /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-                               CLANG_WARN_SUSPICIOUS_MOVES = YES;
-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               MTL_ENABLE_DEBUG_INFO = YES;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/security_asn1;
-                               SKIP_INSTALL = NO;
-                       };
-                       name = Debug;
-               };
-               DC59EA241D91CA15001BDDF5 /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-                               CLANG_WARN_SUSPICIOUS_MOVES = YES;
-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               MTL_ENABLE_DEBUG_INFO = NO;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/security_asn1;
-                               SKIP_INSTALL = NO;
-                       };
-                       name = Release;
-               };
-               DC59EA3C1D91CA82001BDDF5 /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_SUSPICIOUS_MOVES = YES;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               MTL_ENABLE_DEBUG_INFO = YES;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                       };
-                       name = Debug;
-               };
-               DC59EA3D1D91CA82001BDDF5 /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_SUSPICIOUS_MOVES = YES;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               MTL_ENABLE_DEBUG_INFO = NO;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                       };
-                       name = Release;
-               };
-               DC59EA5E1D91CAF0001BDDF5 /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_SUSPICIOUS_MOVES = YES;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               MTL_ENABLE_DEBUG_INFO = YES;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                       };
-                       name = Debug;
-               };
-               DC59EA5F1D91CAF0001BDDF5 /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_SUSPICIOUS_MOVES = YES;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               MTL_ENABLE_DEBUG_INFO = NO;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                       };
-                       name = Release;
-               };
-               DC59EA6E1D91CB9F001BDDF5 /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_SUSPICIOUS_MOVES = YES;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               MTL_ENABLE_DEBUG_INFO = YES;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                       };
-                       name = Debug;
-               };
-               DC59EA6F1D91CB9F001BDDF5 /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_SUSPICIOUS_MOVES = YES;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               MTL_ENABLE_DEBUG_INFO = NO;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                       };
-                       name = Release;
-               };
                DC5ABDCA1D832DAB00CF422C /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                );
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INSTALL_PATH = /usr/local/bin;
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(SDKROOT)/usr/lib/system",
-                               );
                                OTHER_LDFLAGS = (
                                        "$(APPLE_AKS_LIBRARY)",
                                        "-ObjC",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
                                );
                                "OTHER_LDFLAGS[sdk=embedded]" = (
                                        "-lACM",
                                );
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INSTALL_PATH = /usr/local/bin;
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(SDKROOT)/usr/lib/system",
-                               );
                                OTHER_LDFLAGS = (
                                        "$(APPLE_AKS_LIBRARY)",
                                        "-ObjC",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
                                );
                                "OTHER_LDFLAGS[sdk=embedded]" = (
                                        "-lACM",
                        };
                        name = Release;
                };
-               DC71D9F91D95BB0A0065FB93 /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       baseConfigurationReference = D47C56FB1DCA8F4900E18518 /* all_arches.xcconfig */;
-                       buildSettings = {
-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-                               CLANG_WARN_SUSPICIOUS_MOVES = YES;
-                               DEFINES_MODULE = YES;
-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               GENERATE_TEXT_BASED_STUBS = NO;
-                               INLINE_PRIVATE_FRAMEWORKS = NO;
-                               MODULEMAP_FILE = OSX/libsecurity_keychain/libDER/libDER/module.modulemap;
-                               MTL_ENABLE_DEBUG_INFO = YES;
-                               PRODUCT_MODULE_NAME = libDER;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/security_libDER/libDER;
-                               SKIP_INSTALL = YES;
-                               "SKIP_INSTALL[sdk=macosx*]" = NO;
-                               SUPPORTS_TEXT_BASED_API = NO;
-                       };
-                       name = Debug;
-               };
-               DC71D9FA1D95BB0A0065FB93 /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       baseConfigurationReference = D47C56FB1DCA8F4900E18518 /* all_arches.xcconfig */;
-                       buildSettings = {
-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-                               CLANG_WARN_SUSPICIOUS_MOVES = YES;
-                               DEFINES_MODULE = YES;
-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               GENERATE_TEXT_BASED_STUBS = NO;
-                               INLINE_PRIVATE_FRAMEWORKS = NO;
-                               MODULEMAP_FILE = OSX/libsecurity_keychain/libDER/libDER/module.modulemap;
-                               MTL_ENABLE_DEBUG_INFO = NO;
-                               PRODUCT_MODULE_NAME = libDER;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/security_libDER/libDER;
-                               SKIP_INSTALL = YES;
-                               "SKIP_INSTALL[sdk=macosx*]" = NO;
-                               SUPPORTS_TEXT_BASED_API = NO;
-                       };
-                       name = Release;
-               };
                DC82FFE81D90D3F60085674B /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                MTL_ENABLE_DEBUG_INFO = YES;
+                               SUPPORTS_TEXT_BASED_API = NO;
                        };
                        name = Debug;
                };
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                MTL_ENABLE_DEBUG_INFO = NO;
+                               SUPPORTS_TEXT_BASED_API = NO;
                        };
                        name = Release;
                };
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                PRODUCT_NAME = security2;
                                SUPPORTED_PLATFORMS = macosx;
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                PRODUCT_NAME = security2;
                                SUPPORTED_PLATFORMS = macosx;
                                INFOPLIST_FILE = OSX/SecurityTestsOSX/Info.plist;
                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security/;
                                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "\"$(SDKROOT)/usr/lib/system\"",
-                               );
                                OTHER_LDFLAGS = "";
                                "OTHER_LDFLAGS[sdk=embedded]" = (
                                        "$(inherited)",
                                INFOPLIST_FILE = OSX/SecurityTestsOSX/Info.plist;
                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security/;
                                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "\"$(SDKROOT)/usr/lib/system\"",
-                               );
                                OTHER_LDFLAGS = "";
                                "OTHER_LDFLAGS[sdk=embedded]" = (
                                        "$(inherited)",
                                INFOPLIST_FILE = "OSX/sec/securityd/Info-macOS.plist";
                                INSTALL_PATH = /usr/libexec;
                                MTL_ENABLE_DEBUG_INFO = YES;
+                               OTHER_CODE_SIGN_FLAGS = "$(OTHER_CODE_SIGN_FLAGS_LIBRARY_VALIDATION)";
                                OTHER_LDFLAGS = (
                                        "$(APPLE_AKS_LIBRARY)",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "-ObjC",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
                                );
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                USE_HEADERMAP = NO;
                                INFOPLIST_FILE = "OSX/sec/securityd/Info-macOS.plist";
                                INSTALL_PATH = /usr/libexec;
                                MTL_ENABLE_DEBUG_INFO = NO;
+                               OTHER_CODE_SIGN_FLAGS = "$(OTHER_CODE_SIGN_FLAGS_LIBRARY_VALIDATION)";
                                OTHER_LDFLAGS = (
                                        "$(APPLE_AKS_LIBRARY)",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "-ObjC",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
                                );
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                USE_HEADERMAP = NO;
                                INFOPLIST_FILE = "SecurityTests/SecurityTests-Info.plist";
                                INSTALL_PATH = /AppleInternal/Applications;
                                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "\"$(SDKROOT)/usr/lib/system\"",
-                               );
                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                "OTHER_LDFLAGS[sdk=embedded]" = (
                                        "$(inherited)",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "-framework",
                                        CrashReporterSupport,
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:identifier}";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                INFOPLIST_FILE = "SecurityTests/SecurityTests-Info.plist";
                                INSTALL_PATH = /AppleInternal/Applications;
                                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "\"$(SDKROOT)/usr/lib/system\"",
-                               );
                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                "OTHER_LDFLAGS[sdk=embedded]" = (
                                        "$(inherited)",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "-framework",
                                        CrashReporterSupport,
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:identifier}";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                HEADER_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(PROJECT_DIR)",
-                                       "$(PROJECT_DIR)/OSX/libsecurity_keychain/libDER",
+                                       "$(SDKROOT)/usr/local/include/security_libDER",
                                        "$(PROJECT_DIR)/OSX/libsecurity_asn1",
                                        "$(PROJECT_DIR)/libsecurity_smime",
                                        "$(PROJECT_DIR)/OSX/sec",
                                );
                                INFOPLIST_FILE = "Keychain/Keychain-Info.plist";
                                INSTALL_PATH = /AppleInternal/Applications;
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "\"$(SDKROOT)/usr/lib/system\"",
-                               );
                                ONLY_ACTIVE_ARCH = YES;
                                OTHER_LDFLAGS = "$(inherited)";
                                "OTHER_LDFLAGS[sdk=embedded][arch=*]" = (
                                HEADER_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(PROJECT_DIR)",
-                                       "$(PROJECT_DIR)/OSX/libsecurity_keychain/libDER",
+                                       "$(SDKROOT)/usr/local/include/security_libDER",
                                        "$(PROJECT_DIR)/OSX/libsecurity_asn1",
                                        "$(PROJECT_DIR)/libsecurity_smime",
                                        "$(PROJECT_DIR)/OSX/sec",
                                );
                                INFOPLIST_FILE = "Keychain/Keychain-Info.plist";
                                INSTALL_PATH = /AppleInternal/Applications;
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "\"$(SDKROOT)/usr/lib/system\"",
-                               );
                                OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
                                OTHER_LDFLAGS = "$(inherited)";
                                "OTHER_LDFLAGS[sdk=embedded]" = (
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.KeychainCircle.KeychainCircle;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SUPPORTS_TEXT_BASED_API = YES;
+                               TAPI_VERIFY_MODE = ErrorsOnly;
                                VERSIONING_SYSTEM = "apple-generic";
                                VERSION_INFO_PREFIX = "";
                        };
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.KeychainCircle.KeychainCircle;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SUPPORTS_TEXT_BASED_API = YES;
+                               TAPI_VERIFY_MODE = ErrorsOnly;
                                VERSIONING_SYSTEM = "apple-generic";
                                VERSION_INFO_PREFIX = "";
                        };
                                MTL_ENABLE_DEBUG_INFO = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SDKROOT = macosx.internal;
+                               SUPPORTS_TEXT_BASED_API = NO;
                        };
                        name = Debug;
                };
                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SDKROOT = macosx.internal;
+                               SUPPORTS_TEXT_BASED_API = NO;
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
-               EB425CA41C65846D000ECE53 /* Debug */ = {
+               EB425CA41C65846D000ECE53 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+                               CLANG_CXX_LIBRARY = "libc++";
+                               CLANG_ENABLE_OBJC_ARC = YES;
+                               CLANG_WARN_BOOL_CONVERSION = YES;
+                               CLANG_WARN_CONSTANT_CONVERSION = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_EMPTY_BODY = YES;
+                               CLANG_WARN_ENUM_CONVERSION = YES;
+                               CLANG_WARN_INT_CONVERSION = YES;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+                               CODE_SIGN_ENTITLEMENTS = RegressionTests/secbackuptest/secbackuptest.entitlements;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               ENABLE_STRICT_OBJC_MSGSEND = YES;
+                               ENABLE_TESTABILITY = YES;
+                               GCC_C_LANGUAGE_STANDARD = gnu99;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_NO_COMMON_BLOCKS = YES;
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "DEBUG=1",
+                                       "$(inherited)",
+                               );
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               ONLY_ACTIVE_ARCH = YES;
+                               OTHER_LDFLAGS = (
+                                       "-framework",
+                                       Security,
+                               );
+                               "OTHER_LDFLAGS[sdk=embedded]" = (
+                                       "-laks",
+                                       "-framework",
+                                       Security,
+                                       "-framework",
+                                       IOKit,
+                               );
+                               "OTHER_LDFLAGS[sdk=macosx*]" = (
+                                       "-laks",
+                                       "-framework",
+                                       Security,
+                                       "-framework",
+                                       IOKit,
+                               );
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
+                       };
+                       name = Debug;
+               };
+               EB425CA51C65846D000ECE53 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+                               CLANG_CXX_LIBRARY = "libc++";
+                               CLANG_ENABLE_OBJC_ARC = YES;
+                               CLANG_WARN_BOOL_CONVERSION = YES;
+                               CLANG_WARN_CONSTANT_CONVERSION = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_EMPTY_BODY = YES;
+                               CLANG_WARN_ENUM_CONVERSION = YES;
+                               CLANG_WARN_INT_CONVERSION = YES;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+                               CODE_SIGN_ENTITLEMENTS = RegressionTests/secbackuptest/secbackuptest.entitlements;
+                               COPY_PHASE_STRIP = NO;
+                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+                               ENABLE_NS_ASSERTIONS = NO;
+                               ENABLE_STRICT_OBJC_MSGSEND = YES;
+                               GCC_C_LANGUAGE_STANDARD = gnu99;
+                               GCC_NO_COMMON_BLOCKS = YES;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               OTHER_LDFLAGS = (
+                                       "-framework",
+                                       Security,
+                               );
+                               "OTHER_LDFLAGS[sdk=embedded]" = (
+                                       "-laks",
+                                       "-framework",
+                                       Security,
+                                       "-framework",
+                                       IOKit,
+                               );
+                               "OTHER_LDFLAGS[sdk=macosx*]" = (
+                                       "-laks",
+                                       "-framework",
+                                       Security,
+                                       "-framework",
+                                       IOKit,
+                               );
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
+                               VALIDATE_PRODUCT = YES;
+                       };
+                       name = Release;
+               };
+               EB433A261CC3243600A7EACE /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+                               CLANG_CXX_LIBRARY = "libc++";
+                               CLANG_ENABLE_OBJC_ARC = YES;
+                               CLANG_WARN_BOOL_CONVERSION = YES;
+                               CLANG_WARN_CONSTANT_CONVERSION = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_EMPTY_BODY = YES;
+                               CLANG_WARN_ENUM_CONVERSION = YES;
+                               CLANG_WARN_INT_CONVERSION = YES;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+                               CODE_SIGN_ENTITLEMENTS = RegressionTests/secitemstresstest/secitemstresstest.entitlements;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               ENABLE_STRICT_OBJC_MSGSEND = YES;
+                               ENABLE_TESTABILITY = YES;
+                               GCC_C_LANGUAGE_STANDARD = gnu99;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_NO_COMMON_BLOCKS = YES;
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "DEBUG=1",
+                                       "$(inherited)",
+                               );
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               ONLY_ACTIVE_ARCH = YES;
+                               OTHER_LDFLAGS = (
+                                       "-framework",
+                                       Security,
+                               );
+                               "OTHER_LDFLAGS[sdk=embedded]" = (
+                                       "-laks",
+                                       "-framework",
+                                       Security,
+                                       "-framework",
+                                       IOKit,
+                               );
+                               "OTHER_LDFLAGS[sdk=macosx*]" = (
+                                       "-laks",
+                                       "-framework",
+                                       Security,
+                                       "-framework",
+                                       IOKit,
+                               );
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
+                       };
+                       name = Debug;
+               };
+               EB433A271CC3243600A7EACE /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+                               CLANG_CXX_LIBRARY = "libc++";
+                               CLANG_ENABLE_OBJC_ARC = YES;
+                               CLANG_WARN_BOOL_CONVERSION = YES;
+                               CLANG_WARN_CONSTANT_CONVERSION = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_EMPTY_BODY = YES;
+                               CLANG_WARN_ENUM_CONVERSION = YES;
+                               CLANG_WARN_INT_CONVERSION = YES;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+                               CODE_SIGN_ENTITLEMENTS = RegressionTests/secitemstresstest/secitemstresstest.entitlements;
+                               COPY_PHASE_STRIP = NO;
+                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+                               ENABLE_NS_ASSERTIONS = NO;
+                               ENABLE_STRICT_OBJC_MSGSEND = YES;
+                               GCC_C_LANGUAGE_STANDARD = gnu99;
+                               GCC_NO_COMMON_BLOCKS = YES;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               OTHER_LDFLAGS = (
+                                       "-framework",
+                                       Security,
+                               );
+                               "OTHER_LDFLAGS[sdk=embedded]" = (
+                                       "-laks",
+                                       "-framework",
+                                       Security,
+                                       "-framework",
+                                       IOKit,
+                               );
+                               "OTHER_LDFLAGS[sdk=macosx*]" = (
+                                       "-laks",
+                                       "-framework",
+                                       Security,
+                                       "-framework",
+                                       IOKit,
+                               );
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
+                               VALIDATE_PRODUCT = YES;
+                       };
+                       name = Release;
+               };
+               EB49B2B3202D8780003F34A0 /* Debug */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-                               CLANG_CXX_LIBRARY = "libc++";
-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CLANG_WARN_BOOL_CONVERSION = YES;
-                               CLANG_WARN_CONSTANT_CONVERSION = YES;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+                               CLANG_ENABLE_OBJC_WEAK = YES;
+                               CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+                               CLANG_WARN_COMMA = YES;
+                               CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_EMPTY_BODY = YES;
-                               CLANG_WARN_ENUM_CONVERSION = YES;
-                               CLANG_WARN_INT_CONVERSION = YES;
+                               CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_STRICT_PROTOTYPES = YES;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               CODE_SIGN_ENTITLEMENTS = RegressionTests/secbackuptest/secbackuptest.entitlements;
+                               CODE_SIGN_STYLE = Automatic;
+                               COMBINE_HIDPI_IMAGES = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               ENABLE_TESTABILITY = YES;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_NO_COMMON_BLOCKS = YES;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "DEBUG=1",
+                               FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
+                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                );
+                               GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INFOPLIST_FILE = tests/secdmockaks/Info.plist;
+                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
                                MTL_ENABLE_DEBUG_INFO = YES;
-                               ONLY_ACTIVE_ARCH = YES;
                                OTHER_LDFLAGS = (
-                                       "-framework",
-                                       Security,
-                               );
-                               "OTHER_LDFLAGS[sdk=embedded]" = (
-                                       "-laks",
-                                       "-framework",
-                                       Security,
-                                       "-framework",
-                                       IOKit,
-                               );
-                               "OTHER_LDFLAGS[sdk=macosx*]" = (
-                                       "-laks",
-                                       "-framework",
-                                       Security,
-                                       "-framework",
-                                       IOKit,
+                                       "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
+                                       "$(OTHER_LDFLAGS_PROTOBUF)",
+                                       "$(OTHER_LDFLAGS_MOBILEGESTALT)",
+                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",
+                                       "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
+                                       "$(OTHER_LDFLAGS_APS)",
+                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
+                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
+                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.Security.secdmockaks;
                                PRODUCT_NAME = "$(TARGET_NAME)";
-                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
                        };
                        name = Debug;
                };
-               EB425CA51C65846D000ECE53 /* Release */ = {
+               EB49B2B4202D8780003F34A0 /* Release */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-                               CLANG_CXX_LIBRARY = "libc++";
-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CLANG_WARN_BOOL_CONVERSION = YES;
-                               CLANG_WARN_CONSTANT_CONVERSION = YES;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+                               CLANG_ENABLE_OBJC_WEAK = YES;
+                               CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+                               CLANG_WARN_COMMA = YES;
+                               CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_EMPTY_BODY = YES;
-                               CLANG_WARN_ENUM_CONVERSION = YES;
-                               CLANG_WARN_INT_CONVERSION = YES;
+                               CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_STRICT_PROTOTYPES = YES;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               CODE_SIGN_ENTITLEMENTS = RegressionTests/secbackuptest/secbackuptest.entitlements;
+                               CODE_SIGN_STYLE = Automatic;
+                               COMBINE_HIDPI_IMAGES = YES;
                                COPY_PHASE_STRIP = NO;
-                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_NS_ASSERTIONS = NO;
-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_NO_COMMON_BLOCKS = YES;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
-                               MTL_ENABLE_DEBUG_INFO = NO;
-                               OTHER_LDFLAGS = (
-                                       "-framework",
-                                       Security,
-                               );
-                               "OTHER_LDFLAGS[sdk=embedded]" = (
-                                       "-laks",
-                                       "-framework",
-                                       Security,
-                                       "-framework",
-                                       IOKit,
-                               );
-                               "OTHER_LDFLAGS[sdk=macosx*]" = (
-                                       "-laks",
-                                       "-framework",
-                                       Security,
-                                       "-framework",
-                                       IOKit,
-                               );
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
-                               VALIDATE_PRODUCT = YES;
-                       };
-                       name = Release;
-               };
-               EB433A261CC3243600A7EACE /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-                               CLANG_CXX_LIBRARY = "libc++";
-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CLANG_WARN_BOOL_CONVERSION = YES;
-                               CLANG_WARN_CONSTANT_CONVERSION = YES;
-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_EMPTY_BODY = YES;
-                               CLANG_WARN_ENUM_CONVERSION = YES;
-                               CLANG_WARN_INT_CONVERSION = YES;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               CODE_SIGN_ENTITLEMENTS = RegressionTests/secitemstresstest/secitemstresstest.entitlements;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               ENABLE_TESTABILITY = YES;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_NO_COMMON_BLOCKS = YES;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "DEBUG=1",
+                               FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
+                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                );
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
-                               MTL_ENABLE_DEBUG_INFO = YES;
-                               ONLY_ACTIVE_ARCH = YES;
-                               OTHER_LDFLAGS = (
-                                       "-framework",
-                                       Security,
-                               );
-                               "OTHER_LDFLAGS[sdk=embedded]" = (
-                                       "-laks",
-                                       "-framework",
-                                       Security,
-                                       "-framework",
-                                       IOKit,
-                               );
-                               "OTHER_LDFLAGS[sdk=macosx*]" = (
-                                       "-laks",
-                                       "-framework",
-                                       Security,
-                                       "-framework",
-                                       IOKit,
-                               );
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
-                       };
-                       name = Debug;
-               };
-               EB433A271CC3243600A7EACE /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-                               CLANG_CXX_LIBRARY = "libc++";
-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CLANG_WARN_BOOL_CONVERSION = YES;
-                               CLANG_WARN_CONSTANT_CONVERSION = YES;
-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_EMPTY_BODY = YES;
-                               CLANG_WARN_ENUM_CONVERSION = YES;
-                               CLANG_WARN_INT_CONVERSION = YES;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               CODE_SIGN_ENTITLEMENTS = RegressionTests/secitemstresstest/secitemstresstest.entitlements;
-                               COPY_PHASE_STRIP = NO;
-                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-                               ENABLE_NS_ASSERTIONS = NO;
-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_NO_COMMON_BLOCKS = YES;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INFOPLIST_FILE = tests/secdmockaks/Info.plist;
+                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
                                MTL_ENABLE_DEBUG_INFO = NO;
                                OTHER_LDFLAGS = (
-                                       "-framework",
-                                       Security,
-                               );
-                               "OTHER_LDFLAGS[sdk=embedded]" = (
-                                       "-laks",
-                                       "-framework",
-                                       Security,
-                                       "-framework",
-                                       IOKit,
-                               );
-                               "OTHER_LDFLAGS[sdk=macosx*]" = (
-                                       "-laks",
-                                       "-framework",
-                                       Security,
-                                       "-framework",
-                                       IOKit,
+                                       "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
+                                       "$(OTHER_LDFLAGS_PROTOBUF)",
+                                       "$(OTHER_LDFLAGS_MOBILEGESTALT)",
+                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",
+                                       "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
+                                       "$(OTHER_LDFLAGS_APS)",
+                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
+                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
+                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.Security.secdmockaks;
                                PRODUCT_NAME = "$(TARGET_NAME)";
-                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
-                               VALIDATE_PRODUCT = YES;
                        };
                        name = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
+               0C85E0001FB38BB6000343A7 /* Build configuration list for PBXNativeTarget "OTTests" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               0C85E0011FB38BB6000343A7 /* Debug */,
+                               0C85E0021FB38BB6000343A7 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               0C8BBF051FCB446400580909 /* Build configuration list for PBXNativeTarget "otctl" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               0C8BBF061FCB446400580909 /* Debug */,
+                               0C8BBF071FCB446400580909 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
                225394B11E3080A600D3CD9B /* Build configuration list for PBXNativeTarget "security_codesigning_ios" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
+               4727FBC31F9918590003AE36 /* Build configuration list for PBXNativeTarget "secdxctests_ios" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               4727FBBC1F9918590003AE36 /* Debug */,
+                               4727FBBD1F9918590003AE36 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
                47702B221E5F409700B29577 /* Build configuration list for PBXNativeTarget "seckeychainnetworkextensionsystemdaemontest" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
+               478D42991FD72A8100CAB645 /* Build configuration list for PBXNativeTarget "secdxctests_mac" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               478D429A1FD72A8100CAB645 /* Debug */,
+                               478D429B1FD72A8100CAB645 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
                47C51B931EEA657D0032D9E5 /* Build configuration list for PBXNativeTarget "SecurityUnitTests" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
+               6C4605B51F882B9B001421B6 /* Build configuration list for PBXNativeTarget "KeychainAnalyticsTests" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               6C4605B61F882B9B001421B6 /* Debug */,
+                               6C4605B71F882B9B001421B6 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
                6C98085E1E788AEB00E70590 /* Build configuration list for PBXNativeTarget "CKKSCloudKitTests_mac" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
+               6C9AA7A21F7C1D9000D08296 /* Build configuration list for PBXNativeTarget "supdctl" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               6C9AA7A31F7C1D9000D08296 /* Debug */,
+                               6C9AA7A41F7C1D9000D08296 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               6CAA8D241F842FB4007B6E03 /* Build configuration list for PBXNativeTarget "securityuploadd" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               6CAA8D251F842FB4007B6E03 /* Debug */,
+                               6CAA8D261F842FB4007B6E03 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
                6CCDF7881E3C25FB003F2555 /* Build configuration list for PBXNativeTarget "KeychainEntitledTestRunner" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
-               728B56AB16D59979008FA3AB /* Build configuration list for PBXNativeTarget "OTAPKIAssetTool" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               728B56AC16D59979008FA3AB /* Debug */,
-                               728B56AD16D59979008FA3AB /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };
                790851C90CA985C10083CC4D /* Build configuration list for PBXNativeTarget "securityd_ios" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
-               DC17850A1D77873200B50D50 /* Build configuration list for PBXNativeTarget "copyHeadersToSystem" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               DC17850B1D77873200B50D50 /* Debug */,
-                               DC17850C1D77873200B50D50 /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };
                DC17890D1D77980500B50D50 /* Build configuration list for PBXNativeTarget "Security_osx" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
-               DC59E9E91D91C9DC001BDDF5 /* Build configuration list for PBXNativeTarget "DER_not_installed" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               DC59E9EA1D91C9DC001BDDF5 /* Debug */,
-                               DC59E9EB1D91C9DC001BDDF5 /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };
-               DC59EA221D91CA15001BDDF5 /* Build configuration list for PBXNativeTarget "DERUtils" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               DC59EA231D91CA15001BDDF5 /* Debug */,
-                               DC59EA241D91CA15001BDDF5 /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };
-               DC59EA3B1D91CA82001BDDF5 /* Build configuration list for PBXNativeTarget "parseCert" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               DC59EA3C1D91CA82001BDDF5 /* Debug */,
-                               DC59EA3D1D91CA82001BDDF5 /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };
-               DC59EA5D1D91CAF0001BDDF5 /* Build configuration list for PBXNativeTarget "parseCrl" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               DC59EA5E1D91CAF0001BDDF5 /* Debug */,
-                               DC59EA5F1D91CAF0001BDDF5 /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };
-               DC59EA6D1D91CB9F001BDDF5 /* Build configuration list for PBXNativeTarget "parseTicket" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               DC59EA6E1D91CB9F001BDDF5 /* Debug */,
-                               DC59EA6F1D91CB9F001BDDF5 /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };
                DC5ABDC91D832DAB00CF422C /* Build configuration list for PBXNativeTarget "securitytool_macos" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
-               DC71D9F81D95BB0A0065FB93 /* Build configuration list for PBXNativeTarget "DER" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               DC71D9F91D95BB0A0065FB93 /* Debug */,
-                               DC71D9FA1D95BB0A0065FB93 /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };
                DC82FFE71D90D3F60085674B /* Build configuration list for PBXAggregateTarget "security_utilities_DTrace" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
+               EB49B2BA202D8780003F34A0 /* Build configuration list for PBXNativeTarget "secdmockaks" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               EB49B2B3202D8780003F34A0 /* Debug */,
+                               EB49B2B4202D8780003F34A0 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
                EB6A6FA91B90F83A0045DC68 /* Build configuration list for PBXAggregateTarget "phase1_ios" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (